First steps towards supporting W32.

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

4 files changed, 17 insertions, 15 deletions

diff --git a/sm/ChangeLog b/sm/ChangeLog
index ddd392280..20c7460be 100644
--- a/sm/ChangeLog
+++ b/sm/ChangeLog
@@ -1,3 +1,13 @@
+2007-06-06  Werner Koch  <[email protected]>
+
+	* qualified.c (gpgsm_not_qualified_warning) [!ENABLE_NLS]: Do not
+	define orig_codeset.
+	* certdump.c (gpgsm_format_keydesc) [!ENABLE_NLS]: Do not define
+	orig_codeset.
+	(format_name_writer): Define only if funopen et al is available.
+
+	* gpgsm.c (i18n_init): Remove.
+
 2007-05-29  Werner Koch  <[email protected]>
 
 	* export.c (gpgsm_p12_export): Print passphrase encoding info only
diff --git a/sm/certdump.c b/sm/certdump.c
index f5fff38c4..743b4dd41 100644
--- a/sm/certdump.c
+++ b/sm/certdump.c
@@ -735,6 +735,7 @@ gpgsm_es_print_name (estream_t fp, const char *name)
 
 
 
+#if defined (HAVE_FOPENCOOKIE) || defined (HAVE_FUNOPEN)
 /* A cookie structure used for the memory stream. */
 struct format_name_cookie 
 {
@@ -769,6 +770,8 @@ format_name_writer (void *cookie, const char *buffer, size_t size)
 
   return size;
 }
+#endif /*HAVE_FOPENCOOKIE || HAVE_FUNOPEN*/
+
 
 /* Format NAME which is expected to be in rfc2253 format into a better
    human readable format. Caller must free the returned string.  NULL
@@ -890,7 +893,9 @@ gpgsm_format_keydesc (ksba_cert_t cert)
   char created[20];
   char *sn;
   ksba_sexp_t sexp;
+#ifdef ENABLE_NLS
   char *orig_codeset = NULL;
+#endif
 
   name = ksba_cert_get_subject (cert, 0);
   subject = name? gpgsm_format_name2 (name, 0) : NULL;
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index 924286f8f..71559c326 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -601,21 +601,6 @@ set_binary (FILE *fp)
 
 
 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
-}
-
-
-static void
 wrong_args (const char *text)
 {
   fputs (_("usage: gpgsm [options] "), stderr);
diff --git a/sm/qualified.c b/sm/qualified.c
index 4a9c81ddb..0eabeeba4 100644
--- a/sm/qualified.c
+++ b/sm/qualified.c
@@ -290,7 +290,9 @@ gpgsm_not_qualified_warning (ctrl_t ctrl, ksba_cert_t cert)
   gpg_error_t err;
   char *name, *subject, *buffer, *p;
   const char *s;
+#ifdef ENABLE_NLS
   char *orig_codeset = NULL;
+#endif
 
   if (!opt.qualsig_approval)
     return 0;