From 2bded0b66137a2f1c8b69911d91903a24f8a2624 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= Date: Fri, 19 Feb 2016 06:14:10 +0000 Subject: autotools: Use explicit zlib dependency build flags MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use pkg-config if a zlib.pc file is available. Remove the now redundant AC_TRY_LINK_FUNC test (there are no linker flags for GTK+ here). Change-Id: I7de744749eba7231ae0097b975144b76ffcf1bdb Reviewed-on: https://code.wireshark.org/review/14263 Petri-Dish: João Valverde Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde --- epan/Makefile.am | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'epan/Makefile.am') 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) -- cgit v1.2.1