diff options
| author | Guy Harris <guy@alum.mit.edu> | 2006-04-23 18:50:58 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2006-04-23 18:50:58 +0000 |
| commit | 9b639bacaad3e2745a8e14cd9eaf31b5199f7a81 (patch) | |
| tree | 2f454e679dbe6242ae63585b6303dbfc568746ac | |
| parent | 8dd0e707229bc30abdcd3e89bcc1f089ea8cd41c (diff) | |
| download | wireshark-9b639bacaad3e2745a8e14cd9eaf31b5199f7a81.tar.gz | |
From Diego Petteno: link the shared libethereal against the ADNS
library. If that's not done, it leaves to ethereal or other binaries
using it the job of linking adns within them. This behaviour is
unreliable and breaks when using the --as-needed flag for GNU ld
(version 2.16 or better 2.17).
svn path=/trunk/; revision=17969
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | epan/Makefile.am | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -2588,6 +2588,7 @@ Andrei Emeltchenko <Andrei.Emeltchenko [AT] nokia.com> Marc Petit-Huguenin <marc [AT] petit-huguenin.org> Kirby Files <kfiles [AT] masergy.com> Ravi Valmikam <rvalmikam [AT] airvananet.com> +Diego Pettenò <flameeyes [AT] gentoo.org> Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to give his permission to use his version of snprintf.c. diff --git a/epan/Makefile.am b/epan/Makefile.am index 5b0ba0cb0e..8a15c7edb1 100644 --- a/epan/Makefile.am +++ b/epan/Makefile.am @@ -84,7 +84,7 @@ MAINTAINERCLEANFILES = \ # # Add the object files for missing routines, if any. # -libethereal_la_LIBADD = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ dfilter/libdfilter.la ftypes/libftypes.la dissectors/libdissectors.la +libethereal_la_LIBADD = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ dfilter/libdfilter.la ftypes/libftypes.la dissectors/libdissectors.la @ADNS_LIBS@ libethereal_la_DEPENDENCIES = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ dfilter/libdfilter.la ftypes/libftypes.la dissectors/libdissectors.la tvbtest: tvbtest.o tvbuff.o except.o strutil.o |