[svn] GnuPG - r5365 - trunk/dirmngr

[svn author wk]

Author: wk
Date: 2010-06-28 15:37:44 +0200 (Mon, 28 Jun 2010)
New Revision: 5365

Modified:
   trunk/dirmngr/ChangeLog
   trunk/dirmngr/Makefile.am
   trunk/dirmngr/dirmngr-client.c
   trunk/dirmngr/dirmngr_ldap.c
Log:
Make it build on W32 again.


Modified: trunk/dirmngr/ChangeLog
===================================================================
--- trunk/dirmngr/ChangeLog	2010-06-24 10:51:30 UTC (rev 5364)
+++ trunk/dirmngr/ChangeLog	2010-06-28 13:37:44 UTC (rev 5365)
@@ -1,3 +1,14 @@
+2010-06-28  Werner Koch  <wk at g10code.com>
+
+	* dirmngr_ldap.c (my_i18n_init): Remove.
+	(main): Call i18n_init instead of above function.
+
+	* dirmngr-client.c (my_i18n_init): Remove.
+	(main): Call i18n_init instead of above function.
+
+	* Makefile.am (dirmngr_LDADD): Add ../gl/libgnu.
+	(dirmngr_ldap_LDADD, dirmngr_client_LDADD): Ditto.
+
 2010-06-09  Werner Koch  <wk at g10code.com>
 
 	* i18n.h: Remove.

Modified: trunk/dirmngr/Makefile.am
===================================================================
--- trunk/dirmngr/Makefile.am	2010-06-24 10:51:30 UTC (rev 5364)
+++ trunk/dirmngr/Makefile.am	2010-06-28 13:37:44 UTC (rev 5365)
@@ -41,7 +41,7 @@
 	b64dec.c cdb.h cdblib.c ldap.c http.c http.h misc.c	\
 	ocsp.c ocsp.h validate.c validate.h
 
-dirmngr_LDADD = $(libcommonpth) $(DNSLIBS) $(LIBASSUAN_LIBS)  \
+dirmngr_LDADD = $(libcommonpth) ../gl/libgnu.a $(DNSLIBS) $(LIBASSUAN_LIBS) \
 	$(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(PTH_LIBS) $(LIBINTL) $(LIBICONV)
 
 if HAVE_W32_SYSTEM
@@ -53,11 +53,11 @@
 dirmngr_ldap_SOURCES = dirmngr_ldap.c $(ldap_url) no-libgcrypt.c
 dirmngr_ldap_CFLAGS = $(GPG_ERROR_CFLAGS)
 dirmngr_ldap_LDFLAGS =
-dirmngr_ldap_LDADD = $(libcommon) $(DNSLIBS) \
+dirmngr_ldap_LDADD = $(libcommon) ../gl/libgnu.a $(DNSLIBS) \
 		     $(GPG_ERROR_LIBS) $(LDAPLIBS) $(LIBINTL) $(LIBICONV)
 
 dirmngr_client_SOURCES = dirmngr-client.c b64enc.c no-libgcrypt.c
-dirmngr_client_LDADD = $(libcommon) $(LIBASSUAN_LIBS) \
+dirmngr_client_LDADD = $(libcommon) ../gl/libgnu.a $(LIBASSUAN_LIBS) \
 	               $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV)
 
 

Modified: trunk/dirmngr/dirmngr-client.c
===================================================================
--- trunk/dirmngr/dirmngr-client.c	2010-06-24 10:51:30 UTC (rev 5364)
+++ trunk/dirmngr/dirmngr-client.c	2010-06-28 13:37:44 UTC (rev 5365)
@@ -164,22 +164,7 @@
 }
 
 
-static void
-my_i18n_init (void)
-{
-#warning Better use common init functions
-#ifdef USE_SIMPLE_GETTEXT
-  set_gettext_file (PACKAGE);
-#else
-# ifdef ENABLE_NLS
-  setlocale (LC_ALL, "" );
-  bindtextdomain (PACKAGE, LOCALEDIR);
-  textdomain (PACKAGE);
-# endif
-#endif
-}
 
-
 int
 main (int argc, char **argv )
 {
@@ -214,7 +199,7 @@
   assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT);
 
   /* Setup I18N. */
-  my_i18n_init();
+  i18n_init();
 
   /* Parse the command line.  */
   pargs.argc = &argc;

Modified: trunk/dirmngr/dirmngr_ldap.c
===================================================================
--- trunk/dirmngr/dirmngr_ldap.c	2010-06-24 10:51:30 UTC (rev 5364)
+++ trunk/dirmngr/dirmngr_ldap.c	2010-06-28 13:37:44 UTC (rev 5365)
@@ -161,22 +161,6 @@
 }
 
 
-static void
-my_i18n_init (void)
-{
-#warning Better use common init functions
-#ifdef USE_SIMPLE_GETTEXT
-  set_gettext_file (PACKAGE);
-#else
-# ifdef ENABLE_NLS
-  setlocale (LC_ALL, "" );
-  bindtextdomain (PACKAGE, LOCALEDIR);
-  textdomain (PACKAGE);
-# endif
-#endif
-}
-
-
 int
 main (int argc, char **argv )
 {
@@ -194,7 +178,7 @@
   log_set_prefix ("dirmngr_ldap", JNLIB_LOG_WITH_PREFIX); 
   
   /* Setup I18N. */
-  my_i18n_init();
+  i18n_init();
 
   /* LDAP defaults */
   opt.timeout.tv_sec = DEFAULT_LDAP_TIMEOUT;