summaryrefslogtreecommitdiffstats
path: root/kbx
diff options
context:
space:
mode:
Diffstat (limited to 'kbx')
-rw-r--r--kbx/ChangeLog4
-rw-r--r--kbx/Makefile.am6
2 files changed, 8 insertions, 2 deletions
diff --git a/kbx/ChangeLog b/kbx/ChangeLog
index 4631ffe6a..e7c7b9afd 100644
--- a/kbx/ChangeLog
+++ b/kbx/ChangeLog
@@ -1,3 +1,7 @@
+2007-06-15 Werner Koch <wk@g10code.com>
+
+ * Makefile.am (kbxutil_LDADD): Add W32SOCKLIBS.
+
2007-06-12 Werner Koch <wk@g10code.com>
* kbxutil.c (main): Replace some calls by init_common_subsystems.
diff --git a/kbx/Makefile.am b/kbx/Makefile.am
index 3b5de70d1..8a07df398 100644
--- a/kbx/Makefile.am
+++ b/kbx/Makefile.am
@@ -44,10 +44,12 @@ common_sources = \
libkeybox_a_SOURCES = $(common_sources)
-# Note that libcommon is only required to resolve the LIBOBJS.
+# We need W32SOCKLIBS because the init subsystem code in libcommon
+# requires it - although we don't actually need it. It is easier
+# to do it this way.
kbxutil_SOURCES = kbxutil.c $(common_sources)
kbxutil_LDADD = ../jnlib/libjnlib.a ../gl/libgnu.a ../common/libcommon.a \
$(KSBA_LIBS) $(LIBGCRYPT_LIBS) \
- $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV)
+ $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV) $(W32SOCKLIBS)
$(PROGRAMS) : ../jnlib/libjnlib.a ../gl/libgnu.a ../common/libcommon.a