aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Shaw <[email protected]>2003-02-19 18:26:40 +0000
committerDavid Shaw <[email protected]>2003-02-19 18:26:40 +0000
commitfde4e0badbe7bdd9e8f852a728f2c1b6c048aeb3 (patch)
tree9bd2c543dc2cb918fb39642b328a570a1369794f
parent* sign.c (sign_file): Do not push textmode filter onto an unopened IOBUF (diff)
downloadgnupg-fde4e0badbe7bdd9e8f852a728f2c1b6c048aeb3.tar.gz
gnupg-fde4e0badbe7bdd9e8f852a728f2c1b6c048aeb3.zip
* Makefile.am: Use @CAPLIBS@ to link in -lcap if we are using
capabilities.
-rw-r--r--g10/ChangeLog5
-rw-r--r--g10/Makefile.am2
-rw-r--r--keyserver/ChangeLog5
-rw-r--r--keyserver/Makefile.am4
-rw-r--r--tools/ChangeLog5
-rw-r--r--tools/Makefile.am2
6 files changed, 19 insertions, 4 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog
index d0b926468..174a6a298 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-19 David Shaw <[email protected]>
+
+ * Makefile.am: Use @CAPLIBS@ to link in -lcap if we are using
+ capabilities.
+
2003-02-12 David Shaw <[email protected]>
* sign.c (sign_file): Do not push textmode filter onto an unopened
diff --git a/g10/Makefile.am b/g10/Makefile.am
index dc515a2b4..dba2718b4 100644
--- a/g10/Makefile.am
+++ b/g10/Makefile.am
@@ -25,7 +25,7 @@ EXTRA_DIST = options.skel
LDFLAGS = @LDFLAGS@
libexecdir = @libexecdir@/@PACKAGE@
CFLAGS = @CFLAGS@ -DGNUPG_LIBEXECDIR="\"$(libexecdir)\""
-needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a
+needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a @CAPLIBS@
#noinst_PROGRAMS = gpgd
bin_PROGRAMS = gpg gpgv
diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog
index 6e112880c..ce3d2887d 100644
--- a/keyserver/ChangeLog
+++ b/keyserver/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-19 David Shaw <[email protected]>
+
+ * Makefile.am: Use @CAPLIBS@ to link in -lcap if we are using
+ capabilities.
+
2003-02-11 David Shaw <[email protected]>
* Makefile.am: Use the more correct @PACKAGE@ rather than "gnupg".
diff --git a/keyserver/Makefile.am b/keyserver/Makefile.am
index 2abab02ed..a07256470 100644
--- a/keyserver/Makefile.am
+++ b/keyserver/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
#
# This file is part of GnuPG.
#
@@ -31,4 +31,4 @@ libexec_SCRIPTS = @GPGKEYS_MAILTO@
noinst_SCRIPTS = gpgkeys_test
gpgkeys_ldap_LDADD = @LDAPLIBS@ @NETLIBS@
-gpgkeys_hkp_LDADD = ../util/libutil.a @NETLIBS@
+gpgkeys_hkp_LDADD = ../util/libutil.a @NETLIBS@ @CAPLIBS@
diff --git a/tools/ChangeLog b/tools/ChangeLog
index 6c25fc0a8..cf4d9ff68 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-19 David Shaw <[email protected]>
+
+ * Makefile.am: Use @CAPLIBS@ to link in -lcap if we are using
+ capabilities.
+
2003-02-11 David Shaw <[email protected]>
* convert-from-106: Script to automate the 1.0.6->later
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 2d5e681eb..d9bcaca4a 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -20,7 +20,7 @@
EXTRA_DIST = lspgpot ring-a-party mail-signed-keys
INCLUDES = -I.. -I$(top_srcdir)/include -I$(top_srcdir)/intl
-needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a
+needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a @CAPLIBS@
bin_PROGRAMS = gpgsplit
noinst_PROGRAMS = mpicalc bftest clean-sat mk-tdata shmtest