aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorJörg Mayer <jmayer@loplof.de>2006-07-19 15:08:46 +0000
committerJörg Mayer <jmayer@loplof.de>2006-07-19 15:08:46 +0000
commit9da948e2953ae662edfcbc71aa3cc547da65db46 (patch)
tree0603972b7cec1691287b293499f3ad220508a74a /Makefile.am
parent2406710eb1c2cab05abc12c84386f1284475a8b2 (diff)
downloadwireshark-9da948e2953ae662edfcbc71aa3cc547da65db46.tar.gz
wireshark-9da948e2953ae662edfcbc71aa3cc547da65db46.tar.bz2
wireshark-9da948e2953ae662edfcbc71aa3cc547da65db46.zip
Fix to http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=333
The additional libs need to be added to the final linking stage of all programs using it - not just the libs that pull in the dependencies (that doesn't work on all platforms, just most). svn path=/trunk/; revision=18765
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index f5f4522e16..4466107488 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -339,6 +339,7 @@ tshark_LDADD = \
@PCRE_LIBS@ \
@GLIB_LIBS@ -lm \
@PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ @ADNS_LIBS@ @KRB5_LIBS@ \
+ @LIBICONV@ \
@LIBGCRYPT_LIBS@ \
@LIBGNUTLS_LIBS@
@@ -457,6 +458,7 @@ dftest_LDADD = \
@PCRE_LIBS@ \
@GLIB_LIBS@ -lm \
@PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ @ADNS_LIBS@ @KRB5_LIBS@ \
+ @LIBICONV@ \
@LIBGCRYPT_LIBS@ \
@LIBGNUTLS_LIBS@