aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Shaw <[email protected]>2002-06-11 21:39:21 +0000
committerDavid Shaw <[email protected]>2002-06-11 21:39:21 +0000
commitceab809f1eace0ed0a2e9fc606a6a34ab1cd7f8a (patch)
tree7b624d247f2340fdd97228e565c7aa709f9b22a6
parent* Makefile.am: Don't hard-code the LDAP libraries - get them from LDAPLIBS (diff)
downloadgnupg-ceab809f1eace0ed0a2e9fc606a6a34ab1cd7f8a.tar.gz
gnupg-ceab809f1eace0ed0a2e9fc606a6a34ab1cd7f8a.zip
* Makefile.am: link gpg with NETLIBS for the built-in HKP access.
-rw-r--r--g10/ChangeLog4
-rw-r--r--g10/Makefile.am6
2 files changed, 6 insertions, 4 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 1eed7b183..b5e928682 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,7 @@
+2002-06-11 David Shaw <[email protected]>
+
+ * Makefile.am: link gpg with NETLIBS for the built-in HKP access.
+
2002-06-10 David Shaw <[email protected]>
* options.h, keyserver.c (keyserver_opts), g10.c (main): New
diff --git a/g10/Makefile.am b/g10/Makefile.am
index cca0385d0..f59cd8b2d 100644
--- a/g10/Makefile.am
+++ b/g10/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
#
# This file is part of GnuPG.
#
@@ -110,11 +110,10 @@ gpgv_SOURCES = gpgv.c \
LDADD = $(needed_libs) @ZLIBS@ @INTLLIBS@
# gpg gets LIBOBJS to add in mkdtemp if the platform doesn't have it
-gpg_LDADD = @LIBOBJS@ $(LDADD)
+gpg_LDADD = @LIBOBJS@ $(LDADD) @NETLIBS@
$(PROGRAMS): $(needed_libs)
-
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
$(INSTALL_DATA) $(srcdir)/options.skel \
@@ -124,4 +123,3 @@ install-data-local:
echo "removing obsolete gpgm binary" ; \
rm $(DESTDIR)$(bindir)/gpgm ; \
fi
-