4 files changed, 13 insertions, 7 deletions
diff --git a/kbx/ChangeLog b/kbx/ChangeLog
index c10ea126a..ea5b9dbd1 100644
--- a/kbx/ChangeLog
+++ b/kbx/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-26  Werner Koch  <[email protected]>
+
+	* Makefile.am (kbxutil_LDADD): Add ../common/libcommon.a
+
+	* keybox-defs.h: Include stringhelp.h.
+
 2004-09-30  Werner Koch  <[email protected]>
 
 	* kbxutil.c (i18n_init): Always use LC_ALL.
diff --git a/kbx/Makefile.am b/kbx/Makefile.am
index 0b35587cb..ea8436d72 100644
--- a/kbx/Makefile.am
+++ b/kbx/Makefile.am
@@ -43,11 +43,8 @@ common_sources = \
 
 libkeybox_a_SOURCES = $(common_sources)
 
+# Note that libcommon is only required to resolve the LIBOBJS.
 kbxutil_SOURCES = kbxutil.c $(common_sources)
 kbxutil_LDADD   = ../jnlib/libjnlib.a  $(KSBA_LIBS) $(LIBGCRYPT_LIBS) \
-                  -lgpg-error @LIBINTL@ 
-
-
-
-
+                  -lgpg-error $(LIBINTL) ../common/libcommon.a
 
diff --git a/kbx/keybox-defs.h b/kbx/keybox-defs.h
index 4906a386e..5724b85a0 100644
--- a/kbx/keybox-defs.h
+++ b/kbx/keybox-defs.h
@@ -31,8 +31,11 @@
 
 /* We include the type defintions from jnlib instead of defining our
    owns here.  This will not allow us build KBX in a standalone way
-   but tehre is currently no need for it anyway. */
+   but there is currently no need for it anyway.  Same goes for
+   stringhelp.h which for example provides a replacement for stpcpy -
+   fixme: Better the LIBOBJ mechnism. */
 #include "../jnlib/types.h"
+#include "../jnlib/stringhelp.h"
 
 #include "keybox.h"
 
diff --git a/kbx/keybox-update.c b/kbx/keybox-update.c
index 16955502f..eabaa1db2 100644
--- a/kbx/keybox-update.c
+++ b/kbx/keybox-update.c
@@ -66,7 +66,7 @@ create_tmp_file (const char *template,
       strcpy (tmpfname + strlen (template)-4, EXTSEP_S "tmp");
     }
   else 
-    { /* file does not end with kbx; hmmm */
+    { /* File does not end with kbx; hmmm. */
       bakfname = xtrymalloc ( strlen (template) + 5);
       if (!bakfname)
         return gpg_error (gpg_err_code_from_errno (errno));