* Makefile.am (sm): Build kbx only if gpgsm is to be build.

* maperror.c: Removed header ksba.h.  Not required anymore.

ChangeLog

@@ -1,3 +1,7 @@
+2004-07-20  Werner Koch  <wk@g10code.de>
+
+	* Makefile.am (sm): Build kbx only if gpgsm is to be build.
+
 2004-07-20  Werner Koch  <wk@gnupg.org>
 
 	* configure.ac: New option --enable-agent-only.

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:

common/ChangeLog

@@ -1,3 +1,7 @@
+2004-07-20  Werner Koch  <wk@g10code.de>
+
+	* maperror.c: Removed header ksba.h.  Not required anymore.
+
 2004-06-14  Werner Koch  <wk@gnupg.org>
 
 	* xreadline.c: New.  Based on the iobuf_read_line function.

common/maperror.c

@@ -26,7 +26,6 @@
 #include <ctype.h>
 #include <unistd.h>
 
-#include <ksba.h>
 #include <assuan.h>
 
 #include "util.h"