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 /Makefile.am | |
| 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 'Makefile.am')
| -rw-r--r-- | Makefile.am | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index c6a44a130c..55088956df 100644 --- a/Makefile.am +++ b/Makefile.am @@ -518,7 +518,8 @@ text2pcap_CFLAGS = $(GENERATED_CFLAGS) # Libraries with which to link text2pcap. text2pcap_LDADD = \ wsutil/libwsutil.la \ - @GLIB_LIBS@ + @GLIB_LIBS@ \ + @ZLIB_LIBS@ mergecap_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) @@ -526,7 +527,8 @@ mergecap_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) mergecap_LDADD = \ wiretap/libwiretap.la \ wsutil/libwsutil.la \ - @GLIB_LIBS@ + @GLIB_LIBS@ \ + @ZLIB_LIBS@ capinfos_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) @@ -535,7 +537,8 @@ capinfos_LDADD = \ wiretap/libwiretap.la \ wsutil/libwsutil.la \ @GLIB_LIBS@ \ - @LIBGCRYPT_LIBS@ + @LIBGCRYPT_LIBS@ \ + @ZLIB_LIBS@ captype_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) @@ -543,7 +546,8 @@ captype_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) captype_LDADD = \ wiretap/libwiretap.la \ wsutil/libwsutil.la \ - @GLIB_LIBS@ + @GLIB_LIBS@ \ + @ZLIB_LIBS@ editcap_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) @@ -551,7 +555,8 @@ editcap_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) editcap_LDADD = \ wiretap/libwiretap.la \ wsutil/libwsutil.la \ - @GLIB_LIBS@ + @GLIB_LIBS@ \ + @ZLIB_LIBS@ reordercap_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) @@ -559,7 +564,8 @@ reordercap_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) reordercap_LDADD = \ wiretap/libwiretap.la \ wsutil/libwsutil.la \ - @GLIB_LIBS@ + @GLIB_LIBS@ \ + @ZLIB_LIBS@ randpkt_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) @@ -573,7 +579,8 @@ randpkt_LDADD = \ @SOCKET_LIBS@ \ @NSL_LIBS@ \ @C_ARES_LIBS@ \ - @ADNS_LIBS@ + @ADNS_LIBS@ \ + @ZLIB_LIBS@ dftest_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) @@ -630,7 +637,8 @@ dumpcap_LDADD = \ @SYSTEMCONFIGURATION_FRAMEWORKS@ \ @COREFOUNDATION_FRAMEWORKS@ \ @LIBCAP_LIBS@ \ - @LIBNL_LIBS@ + @LIBNL_LIBS@ \ + @ZLIB_LIBS@ # # Build the version string |