# HG changeset patch
# User Mike Ruprecht <cmaiku@gmail.com>
# Date 1500397524 18000
# Node ID 02fde6fa7904b4085f533388004be8979e640c78
# Parent  ea61e3b679a70154f4a08ecbfd5de6dca1d20a3c
Remove now unused direct references and checks of zlib

Now that we're using GZlibDecompressor, we no longer directly use
zlib. This patch removes the explicit check for it and any related
references.

diff -r ea61e3b679a7 -r 02fde6fa7904 configure.ac
--- a/configure.ac	Sat Jul 22 13:44:39 2017 -0500
+++ b/configure.ac	Tue Jul 18 12:05:24 2017 -0500
@@ -829,17 +829,6 @@
 AC_SUBST(JSON_LIBS)
 
 dnl #######################################################################
-dnl # Check for zlib (required)
-dnl #######################################################################
-
-PKG_CHECK_MODULES(ZLIB, [zlib >= 1.2.0], , [
-	AC_SEARCH_LIBS([deflate], [z], [], AC_MSG_ERROR([You must have zlib >= 1.2.0 development headers installed to build.]), [])
-])
-
-AC_SUBST(ZLIB_CFLAGS)
-AC_SUBST(ZLIB_LIBS)
-
-dnl #######################################################################
 dnl # Check for GStreamer
 dnl #######################################################################
 AC_ARG_ENABLE(gstreamer,
diff -r ea61e3b679a7 -r 02fde6fa7904 doc/reference/libpurple/Makefile.am
--- a/doc/reference/libpurple/Makefile.am	Sat Jul 22 13:44:39 2017 -0500
+++ b/doc/reference/libpurple/Makefile.am	Tue Jul 18 12:05:24 2017 -0500
@@ -134,7 +134,6 @@
 	$(IDN_CFLAGS) \
 	$(NETWORKMANAGER_CFLAGS) \
 	$(JSON_CFLAGS) \
-	$(ZLIB_CFLAGS) \
 	$(INTROSPECTION_CFLAGS)
 
 GTKDOC_LIBS = \
@@ -152,7 +151,6 @@
 	$(GSTINTERFACES_LIBS) \
 	$(IDN_LIBS) \
 	$(JSON_LIBS) \
-	$(ZLIB_LIBS) \
 	$(INTROSPECTION_LIBS) \
 	-lm
 
diff -r ea61e3b679a7 -r 02fde6fa7904 doc/reference/protocols/facebook/Makefile.am
--- a/doc/reference/protocols/facebook/Makefile.am	Sat Jul 22 13:44:39 2017 -0500
+++ b/doc/reference/protocols/facebook/Makefile.am	Tue Jul 18 12:05:24 2017 -0500
@@ -88,7 +88,6 @@
 	$(GPLUGIN_CFLAGS) \
 	$(DEBUG_CFLAGS) \
 	$(JSON_CFLAGS) \
-	$(ZLIB_CFLAGS) \
 	$(INTROSPECTION_CFLAGS)
 
 GTKDOC_LIBS = \
@@ -98,7 +97,6 @@
 	$(GPLUGIN_LIBS) \
 	$(INTLLIBS) \
 	$(JSON_LIBS) \
-	$(ZLIB_LIBS) \
 	$(INTROSPECTION_LIBS)
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
diff -r ea61e3b679a7 -r 02fde6fa7904 libpurple/Makefile.am
--- a/libpurple/Makefile.am	Sat Jul 22 13:44:39 2017 -0500
+++ b/libpurple/Makefile.am	Tue Jul 18 12:05:24 2017 -0500
@@ -434,7 +434,6 @@
 	$(GSTINTERFACES_LIBS) \
 	$(IDN_LIBS) \
 	$(JSON_LIBS) \
-	$(ZLIB_LIBS) \
 	$(INTROSPECTION_LIBS) \
 	-lm
 
@@ -452,7 +451,6 @@
 	$(IDN_CFLAGS) \
 	$(NETWORKMANAGER_CFLAGS) \
 	$(JSON_CFLAGS) \
-	$(ZLIB_CFLAGS) \
 	$(INTROSPECTION_CFLAGS)
 
 -include $(INTROSPECTION_MAKEFILE)
@@ -492,7 +490,6 @@
 	$(IDN_CFLAGS) \
 	$(NETWORKMANAGER_CFLAGS) \
 	$(JSON_CFLAGS) \
-	$(ZLIB_CFLAGS) \
 	$(INTROSPECTION_CFLAGS)
 
 Purple_3_0_gir_LIBS = $(builddir)/libpurple.la
diff -r ea61e3b679a7 -r 02fde6fa7904 libpurple/meson.build
--- a/libpurple/meson.build	Sat Jul 22 13:44:39 2017 -0500
+++ b/libpurple/meson.build	Tue Jul 18 12:05:24 2017 -0500
@@ -393,8 +393,7 @@
                     dependencies : # static_link_libs
                         [dbus, dbus_glib, dnsapi, ws2_32, glib, gio, gplugin, libxml,
                          farstream, gstreamer, gstreamer_video,
-                         gstreamer_app, idn, json,
-                         zlib, math])
+                         gstreamer_app, idn, json, math])
 libpurple_dep = declare_dependency(
     sources : purple_builtheaders,  # Ensure built before any dependencies.
     include_directories : [toplevel_inc, libpurple_inc],
diff -r ea61e3b679a7 -r 02fde6fa7904 libpurple/protocols/facebook/Makefile.am
--- a/libpurple/protocols/facebook/Makefile.am	Sat Jul 22 13:44:39 2017 -0500
+++ b/libpurple/protocols/facebook/Makefile.am	Tue Jul 18 12:05:24 2017 -0500
@@ -48,6 +48,5 @@
 	-I$(top_srcdir) \
 	$(GLIB_CFLAGS) \
 	$(JSON_CFLAGS) \
-	$(ZLIB_CFLAGS) \
 	$(GPLUGIN_CFLAGS) \
 	$(DEBUG_CFLAGS)
diff -r ea61e3b679a7 -r 02fde6fa7904 meson.build
--- a/meson.build	Sat Jul 22 13:44:39 2017 -0500
+++ b/meson.build	Tue Jul 18 12:05:24 2017 -0500
@@ -604,12 +604,6 @@
 json = dependency('json-glib-1.0', version : '>= 0.14.0')
 
 #######################################################################
-# Check for zlib (required)
-#######################################################################
-
-zlib = dependency('zlib', version : '>= 1.2.0')
-
-#######################################################################
 # Check for GStreamer
 #######################################################################