diff options
| author | Werner Koch <[email protected]> | 2004-07-20 18:41:49 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2004-07-20 18:41:49 +0000 |
| commit | 2e10dbd6c8a7b8a80f90e9ff6e4285803c86dc48 (patch) | |
| tree | 4dd96fbde0c63dcabcac1d26e624ee245777a2c7 | |
| parent | New option --enable-agent-only. (diff) | |
| download | gnupg-2e10dbd6c8a7b8a80f90e9ff6e4285803c86dc48.tar.gz gnupg-2e10dbd6c8a7b8a80f90e9ff6e4285803c86dc48.zip | |
* Makefile.am (sm): Build kbx only if gpgsm is to be build.
* maperror.c: Removed header ksba.h. Not required anymore.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Makefile.am | 9 | ||||
| -rw-r--r-- | common/ChangeLog | 4 | ||||
| -rw-r--r-- | common/maperror.c | 1 |
4 files changed, 16 insertions, 2 deletions
@@ -1,3 +1,7 @@ +2004-07-20 Werner Koch <[email protected]> + + * Makefile.am (sm): Build kbx only if gpgsm is to be build. + 2004-07-20 Werner Koch <[email protected]> * configure.ac: New option --enable-agent-only. diff --git a/Makefile.am b/Makefile.am index 8f7d1771c..9be193353 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,6 +24,13 @@ ACLOCAL_AMFLAGS = -I m4 EXTRA_DIST = scripts/config.rpath autogen.sh README.CVS DISTCLEANFILES = g10defs.h +if BUILD_GPGSM +kbx = kbx +else +kbx = +endif + + if BUILD_GPG gpg = g10 else @@ -45,7 +52,7 @@ else scd = endif -SUBDIRS = m4 intl jnlib common kbx \ +SUBDIRS = m4 intl jnlib common ${kbx} \ ${gpg} ${sm} ${agent} ${scd} tools po doc tests dist-hook: diff --git a/common/ChangeLog b/common/ChangeLog index a848b8c78..a3a23bee1 100644 --- a/common/ChangeLog +++ b/common/ChangeLog @@ -1,3 +1,7 @@ +2004-07-20 Werner Koch <[email protected]> + + * maperror.c: Removed header ksba.h. Not required anymore. + 2004-06-14 Werner Koch <[email protected]> * xreadline.c: New. Based on the iobuf_read_line function. diff --git a/common/maperror.c b/common/maperror.c index 2f6f1b159..89ecee987 100644 --- a/common/maperror.c +++ b/common/maperror.c @@ -26,7 +26,6 @@ #include <ctype.h> #include <unistd.h> -#include <ksba.h> #include <assuan.h> #include "util.h" |