From 9b639bacaad3e2745a8e14cd9eaf31b5199f7a81 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Sun, 23 Apr 2006 18:50:58 +0000 Subject: 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 --- AUTHORS | 1 + epan/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index dcf7e793a9..4590db1a09 100644 --- a/AUTHORS +++ b/AUTHORS @@ -2588,6 +2588,7 @@ Andrei Emeltchenko Marc Petit-Huguenin Kirby Files Ravi Valmikam +Diego Pettenò Alain Magloire 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 -- cgit v1.2.1