3 files changed, 8 insertions, 6 deletions
diff --git a/epan/Makefile.am b/epan/Makefile.am
index dd192a7a25..b64d4de846 100644
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -43,7 +43,7 @@ ACLOCAL_AMFLAGS = `../aclocal-flags`
 AM_CPPFLAGS = $(INCLUDEDIRS) -I$(builddir)/wslua $(WS_CPPFLAGS) \
 	$(GLIB_CFLAGS) $(LUA_CFLAGS) $(LIBGNUTLS_CFLAGS) \
 	$(LIBGCRYPT_CFLAGS) $(LIBSMI_CFLAGS) $(LIBGEOIP_CFLAGS) \
-	$(KRB5_CFLAGS)
+	$(KRB5_CFLAGS) $(ZLIB_CFLAGS)
 
 noinst_LTLIBRARIES = libwireshark_generated.la libwireshark_asmopt.la
 lib_LTLIBRARIES = libwireshark.la
@@ -147,6 +147,7 @@ libwireshark_la_LIBADD = \
 	@LIBSMI_LDFLAGS@	\
 	@GEOIP_LIBS@		\
 	@GLIB_LIBS@		\
+	$(ZLIB_LIBS)		\
 	-lm
 
 libwireshark_la_DEPENDENCIES = \
@@ -168,17 +169,17 @@ EXTRA_PROGRAMS = reassemble_test tvbtest oids_test
 reassemble_test_LDADD = \
 	libwireshark.la \
 	$(GLIB_LIBS) \
-	-lz
+	$(ZLIB_LIBS)
 
 tvbtest_LDADD = \
 	libwireshark.la \
 	$(GLIB_LIBS) \
-	-lz
+	$(ZLIB_LIBS)
 
 oids_test_LDADD = \
 	libwireshark.la \
 	$(GLIB_LIBS) \
-	-lz
+	$(ZLIB_LIBS)
 
 exntest: exntest.o except.o
 	$(LINK) $^ $(GLIB_LIBS)
diff --git a/epan/dissectors/Makefile.am b/epan/dissectors/Makefile.am
index d49985b574..4a9e97d8d7 100644
--- a/epan/dissectors/Makefile.am
+++ b/epan/dissectors/Makefile.am
@@ -22,7 +22,8 @@ include Makefile.common
 include $(top_srcdir)/Makefile.am.inc
 
 AM_CPPFLAGS = $(INCLUDEDIRS) -I$(top_srcdir)/epan $(WS_CPPFLAGS) \
-	$(GLIB_CFLAGS) $(LIBGNUTLS_CFLAGS) $(LIBGCRYPT_CFLAGS)
+	$(GLIB_CFLAGS) $(LIBGNUTLS_CFLAGS) $(LIBGCRYPT_CFLAGS) \
+	$(ZLIB_CFLAGS)
 
 noinst_LTLIBRARIES = libdirtydissectors.la libfiledissectors.la libdissectors.la
 
diff --git a/epan/wslua/Makefile.am b/epan/wslua/Makefile.am
index 48b20925c1..23a267898a 100644
--- a/epan/wslua/Makefile.am
+++ b/epan/wslua/Makefile.am
@@ -22,7 +22,7 @@
 include $(top_srcdir)/Makefile.am.inc
 
 AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) $(LUA_CFLAGS) \
-	$(GLIB_CFLAGS)
+	$(GLIB_CFLAGS) $(ZLIB_CFLAGS)
 
 noinst_LTLIBRARIES = libwslua.la