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 --- wiretap/Makefile.am | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'wiretap/Makefile.am') diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am index d716817767..3be75a7545 100644 --- a/wiretap/Makefile.am +++ b/wiretap/Makefile.am @@ -24,7 +24,8 @@ include $(top_srcdir)/Makefile.am.inc ACLOCAL_AMFLAGS = `../aclocal-flags` -AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) -DWS_BUILD_DLL $(GLIB_CFLAGS) +AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) -DWS_BUILD_DLL $(GLIB_CFLAGS) \ + $(ZLIB_CFLAGS) noinst_LTLIBRARIES = libwiretap_generated.la lib_LTLIBRARIES = libwiretap.la @@ -63,7 +64,11 @@ EXTRA_DIST = \ $(GENERATOR_FILES) \ $(GENERATED_FILES) -libwiretap_la_LIBADD = libwiretap_generated.la ${top_builddir}/wsutil/libwsutil.la $(GLIB_LIBS) +libwiretap_la_LIBADD = \ + libwiretap_generated.la \ + ${top_builddir}/wsutil/libwsutil.la \ + $(GLIB_LIBS) \ + $(ZLIB_LIBS) libwiretap_la_DEPENDENCIES = libwiretap_generated.la ${top_builddir}/wsutil/libwsutil.la -- cgit v1.2.1