Build fixes for W32

ChangeLog

@@ -1,3 +1,10 @@
+2007-06-15  Werner Koch  <wk@g10code.com>
+
+	* configure.ac (W32SOCKLIBS): New.
+
+	* autogen.sh: Use = and not == in test to be POSIXly correct.
+	<build-w32>: Disable use of regex.
+
 2007-06-14  Werner Koch  <wk@g10code.com>
 
 	* configure.ac [AH_BOTTOM]: Remove the hardwired names of modules.

TODO

@@ -71,10 +71,14 @@
 
 ** Add a test to check the extkeyusage.
 
-* Windows port
+* Windows port (W32)
 ** Signals are not support 
     This means we can't reread a configuration
 ** No card status notifications.
+** Regex support is disabled
+  We need to adjust the test to find the regex we have anyway in 
+  gpg4in.  Is that regex compatible to the OpenPGP requirement?
+
 
 * sm/
 ** check that we issue NO_SECKEY xxx if a -u key was not found
@@ -127,4 +131,3 @@
 ** Migrate OpenPGP keys to another system
 
 
-

autogen.sh

@@ -40,7 +40,7 @@ MSGMERGE=${GETTEXT_PREFIX}${MSGMERGE:-msgmerge}${GETTEXT_SUFFIX}
 
 DIE=no
 FORCE=
-if test "$1" == "--force"; then
+if test x"$1" = x"--force"; then
   FORCE=" --force"
   shift
 fi
@@ -92,7 +92,8 @@ if test "$1" = "--build-w32"; then
 	     --with-libassuan-prefix=${w32root} \
 	     --with-zlib=${w32root} \
              --with-pth-prefix=${w32root} \
-             --without-included-gettext
+             --without-included-gettext \
+             --disable-regex
     rc=$?
     exit $rc
 fi

configure.ac

@@ -1152,13 +1152,17 @@ AM_CONDITIONAL(CROSS_COMPILING, test x$cross_compiling = xyes)
 GNUPG_CHECK_GNUMAKE
 
 # Add some extra libs here so that previous tests don't fail for
-# mysterious reasons - the final link step should bail out. 
+# mysterious reasons - the final link step should bail out.
+# W32SOCKLIBS is also defined so that if can be used for tools not
+# requiring any network stuff but linking to code in libcommon which
+# tracks in winsock stuff (e.g. init_common_subsystems.
 if test "$have_w32_system" = yes; then
-   NETLIBS="${NETLIBS} -lwsock32"
+   W32SOCKLIBS="-lwsock32"
+   NETLIBS="${NETLIBS} ${W32SOCKLIBS}"
 fi
 
 AC_SUBST(NETLIBS)
-
+AC_SUBST(W32SOCKLIBS)
 
 #
 # Setup gcc specific options

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.

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

tools/ChangeLog

@@ -1,3 +1,8 @@
+2007-06-15  Werner Koch  <wk@g10code.com>
+
+	* Makefile.am (symcryptrun_LDADD): It is LIBICONV and not LIBINCONV.
+	(gpgconf_LDADD, symcryptrun_LDADD): Add W32SOCKLIBS.
+
 2007-06-14  Werner Koch  <wk@g10code.com>
 
 	* symcryptrun.c (main): Setup default socket name for

tools/Makefile.am

@@ -62,14 +62,15 @@ gpgconf_SOURCES = gpgconf.c gpgconf.h gpgconf-comp.c no-libgcrypt.c
 # jnlib/common sucks in gpg-error, will they, nil they (some compilers
 # do not eliminate the supposed-to-be-unused-inline-functions).
 gpgconf_LDADD = $(common_libs) \
-                $(LIBINTL) $(GPG_ERROR_LIBS) $(LIBICONV)
+                $(LIBINTL) $(GPG_ERROR_LIBS) $(LIBICONV) $(W32SOCKLIBS)
 
 gpgparsemail_SOURCES = gpgparsemail.c rfc822parse.c rfc822parse.h
 gpgparsemail_LDADD = 
 
 symcryptrun_SOURCES = symcryptrun.c
 symcryptrun_LDADD = $(LIBUTIL_LIBS) $(common_libs) $(pwquery_libs) \
-                    $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBINCONV)
+                    $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) \
+                    $(LIBICONV) $(W32SOCKLIBS)
 
 watchgnupg_SOURCES = watchgnupg.c 
 watchgnupg_LDADD = $(NETLIBS)