First steps towards supporting W32.

This is mainly source code reorganization.
Update gnulib.
g10/ does currently not build.

tools/ChangeLog

@@ -1,3 +1,14 @@
+2007-06-06  Werner Koch  <wk@g10code.com>
+
+	* Makefile.am (bin_PROGRAMS) [W32]: Do not build gpgparsemail.
+
+	* gpgconf-comp.c [W32]: Do not include pwd.h and grp.h.
+	(key_matches_user_or_group) [W32]: For now always return false.
+
+	* symcryptrun.c (i18n_init): Remove.
+	* gpgconf.c (i18n_init): Remove.
+	* gpg-connect-agent.c (i18n_init): Remove.
+
 2007-05-19  Marcus Brinkmann  <marcus@g10code.de>
 
 	* symcryptrun.c (confucius_get_pass): Free ORIG_CODESET on error.

tools/Makefile.am

@@ -43,10 +43,9 @@ else
   symcryptrun =
 endif
 
-bin_PROGRAMS = gpgconf gpg-connect-agent gpgkey2ssh ${symcryptrun} \
-	       gpgparsemail
+bin_PROGRAMS = gpgconf gpg-connect-agent gpgkey2ssh ${symcryptrun}
 if !HAVE_W32_SYSTEM
-bin_PROGRAMS += watchgnupg
+bin_PROGRAMS += watchgnupg gpgparsemail
 endif
 
 noinst_PROGRAMS = clean-sat mk-tdata make-dns-cert gpgsplit

tools/gpg-connect-agent.c

@@ -142,21 +142,6 @@ my_strusage( int level )
 }
 
 
-/* Initialize the gettext system. */
-static void
-i18n_init(void)
-{
-#ifdef USE_SIMPLE_GETTEXT
-  set_gettext_file (PACKAGE_GT);
-#else
-# ifdef ENABLE_NLS
-  setlocale (LC_ALL, "" );
-  bindtextdomain (PACKAGE_GT, LOCALEDIR);
-  textdomain (PACKAGE_GT);
-# endif
-#endif
-}
-
 /* Store an inquire response pattern.  Note, that this function may
    change the content of LINE.  We assume that leading white spaces
    are already removed. */

tools/gpgconf-comp.c

@@ -33,8 +33,10 @@
 #include <time.h>
 #include <stdarg.h>
 #include <signal.h>
+#ifndef HAVE_W32_SYSTEM
 #include <pwd.h>
 #include <grp.h>
+#endif
 
 /* For log_logv(), asctimestamp(), gnupg_get_time ().  */
 #define JNLIB_NEED_LOG_LOGV
@@ -2574,6 +2576,9 @@ gc_component_change_options (int component, FILE *in)
 static int
 key_matches_user_or_group (char *user)
 {
+#ifdef HAVE_W32_SYSTEM
+# warning We need a real user and group lookup.
+#else
   char *group;
   int n;
 
@@ -2641,7 +2646,7 @@ key_matches_user_or_group (char *user)
         if (!strcmp (group, my_supgroups[n]))
           return 1; /* Found.  */
     }
-
+#endif
   return 0; /* No match.  */
 }
 

tools/gpgconf.c

@@ -104,22 +104,6 @@ my_strusage( int level )
 }
 
 
-/* Initialize the gettext system. */
-static void
-i18n_init(void)
-{
-#ifdef USE_SIMPLE_GETTEXT
-  set_gettext_file (PACKAGE_GT);
-#else
-# ifdef ENABLE_NLS
-  setlocale (LC_ALL, "" );
-  bindtextdomain (PACKAGE_GT, LOCALEDIR);
-  textdomain (PACKAGE_GT);
-# endif
-#endif
-}
-
-
 /* gpgconf main. */
 int
 main (int argc, char **argv)

tools/symcryptrun.c

@@ -223,21 +223,6 @@ my_strusage (int level)
 }
 
 
-/* Initialize the gettext system.  */
-static void
-i18n_init(void)
-{
-#ifdef USE_SIMPLE_GETTEXT
-  set_gettext_file (PACKAGE_GT);
-#else
-# ifdef ENABLE_NLS
-  setlocale (LC_ALL, "");
-  bindtextdomain (PACKAGE_GT, LOCALEDIR);
-  textdomain (PACKAGE_GT);
-# endif
-#endif
-}
-
 
 /* This is in the GNU C library in unistd.h.  */