diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2016-02-19 06:14:10 +0000 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2016-03-03 03:49:08 +0000 |
| commit | 2bded0b66137a2f1c8b69911d91903a24f8a2624 (patch) | |
| tree | 0dbcc0a6479b8b29fd6487e3107db39dd4dfcb1a /wiretap | |
| parent | 4fca15308968d6fd526eb67497148d2cd6c0b703 (diff) | |
autotools: Use explicit zlib dependency build flags
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 <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/Makefile.am | 9 |
1 files changed, 7 insertions, 2 deletions
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 |