From 2e10dbd6c8a7b8a80f90e9ff6e4285803c86dc48 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Tue, 20 Jul 2004 18:41:49 +0000
Subject: [PATCH] * Makefile.am (sm): Build kbx only if gpgsm is to be build.

* maperror.c: Removed header ksba.h.  Not required anymore.
---
 ChangeLog         | 4 ++++
 Makefile.am       | 9 ++++++++-
 common/ChangeLog  | 4 ++++
 common/maperror.c | 1 -
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9fad1ba5b..dc43552dd 100644
--- a/ChangeLog
+++ b/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.
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  <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.
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"