From 5707b80e59b4fb9afb55003da819a8490767bb1a Mon Sep 17 00:00:00 2001 From: David Shaw Date: Mon, 25 Aug 2003 03:37:06 +0000 Subject: [PATCH] * Makefile.am: Use NETLIBS instead of EGDLIBS. --- g10/ChangeLog | 2 ++ g10/Makefile.am | 2 +- tools/ChangeLog | 4 ++++ tools/Makefile.am | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/g10/ChangeLog b/g10/ChangeLog index 5dd0c0a13..bd66c6486 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,5 +1,7 @@ 2003-08-24 David Shaw + * Makefile.am: Use NETLIBS instead of EGDLIBS. + * mainproc.c (check_sig_and_print): Get the uid validity before printing any sig results to avoid munging the output with trustdb warnings. diff --git a/g10/Makefile.am b/g10/Makefile.am index 1bd2d0a51..07d6ea5e1 100644 --- a/g10/Makefile.am +++ b/g10/Makefile.am @@ -108,7 +108,7 @@ gpgv_SOURCES = gpgv.c \ LDADD = $(needed_libs) @INTLLIBS@ @CAPLIBS@ @ZLIBS@ @W32LIBS@ # gpg gets LIBOBJS to add in mkdtemp if the platform doesn't have it -gpg_LDADD = @LIBOBJS@ $(LDADD) @DLLIBS@ @EGDLIBS@ +gpg_LDADD = @LIBOBJS@ $(LDADD) @DLLIBS@ @NETLIBS@ $(PROGRAMS): $(needed_libs) diff --git a/tools/ChangeLog b/tools/ChangeLog index 94e3e6089..7e2e82cbe 100644 --- a/tools/ChangeLog +++ b/tools/ChangeLog @@ -1,3 +1,7 @@ +2003-08-24 David Shaw + + * Makefile.am: Use NETLIBS instead of EGDLIBS. + 2003-07-10 David Shaw * Makefile.am: Use W32LIBS where appropriate. diff --git a/tools/Makefile.am b/tools/Makefile.am index 387348f6e..a8325604d 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -27,7 +27,7 @@ noinst_PROGRAMS = mpicalc bftest clean-sat mk-tdata shmtest gpgsplit_LDADD = $(needed_libs) @INTLLIBS@ @CAPLIBS@ @ZLIBS@ mpicalc_LDADD = $(needed_libs) @INTLLIBS@ @CAPLIBS@ @W32LIBS@ -bftest_LDADD = $(needed_libs) @INTLLIBS@ @CAPLIBS@ @W32LIBS@ @DLLIBS@ @EGDLIBS@ +bftest_LDADD = $(needed_libs) @INTLLIBS@ @CAPLIBS@ @W32LIBS@ @DLLIBS@ @NETLIBS@ shmtest_LDADD = $(needed_libs) @INTLLIBS@ @CAPLIBS@ gpgsplit mpicalc bftest shmtest: $(needed_libs)