security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

Make it build on W32 again.

This commit is contained in:
Werner Koch 2010-06-28 13:37:44 +00:00
parent c8bafe218c
commit 20a24312b0
4 changed files with 16 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dirmngr/ChangeLog
View File

@ -1,3 +1,14 @@
2010-06-28 Werner Koch <wk@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@g10code.com> 2010-06-09 Werner Koch <wk@g10code.com>
* i18n.h: Remove. * i18n.h: Remove.

6
dirmngr/Makefile.am
View File

@ -41,7 +41,7 @@ dirmngr_SOURCES = dirmngr.c dirmngr.h server.c crlcache.c crlfetch.c \
b64dec.c cdb.h cdblib.c ldap.c http.c http.h misc.c \ b64dec.c cdb.h cdblib.c ldap.c http.c http.h misc.c \
ocsp.c ocsp.h validate.c validate.h 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) $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(PTH_LIBS) $(LIBINTL) $(LIBICONV)
if HAVE_W32_SYSTEM if HAVE_W32_SYSTEM
@ -53,11 +53,11 @@ endif
dirmngr_ldap_SOURCES = dirmngr_ldap.c $(ldap_url) no-libgcrypt.c dirmngr_ldap_SOURCES = dirmngr_ldap.c $(ldap_url) no-libgcrypt.c
dirmngr_ldap_CFLAGS = $(GPG_ERROR_CFLAGS) dirmngr_ldap_CFLAGS = $(GPG_ERROR_CFLAGS)
dirmngr_ldap_LDFLAGS = dirmngr_ldap_LDFLAGS =
dirmngr_ldap_LDADD = $(libcommon) $(DNSLIBS) \ dirmngr_ldap_LDADD = $(libcommon) ../gl/libgnu.a $(DNSLIBS) \
$(GPG_ERROR_LIBS) $(LDAPLIBS) $(LIBINTL) $(LIBICONV) $(GPG_ERROR_LIBS) $(LDAPLIBS) $(LIBINTL) $(LIBICONV)
dirmngr_client_SOURCES = dirmngr-client.c b64enc.c no-libgcrypt.c 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) $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV)

17
dirmngr/dirmngr-client.c
View File

@ -164,21 +164,6 @@ my_strusage (int level)
} }
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 int
main (int argc, char **argv ) main (int argc, char **argv )
@ -214,7 +199,7 @@ main (int argc, char **argv )
assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT); assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT);
/* Setup I18N. */ /* Setup I18N. */
my_i18n_init(); i18n_init();
/* Parse the command line. */ /* Parse the command line. */
pargs.argc = &argc; pargs.argc = &argc;

18
dirmngr/dirmngr_ldap.c
View File

@ -161,22 +161,6 @@ my_strusage (int level)
} }
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 int
main (int argc, char **argv ) main (int argc, char **argv )
{ {
@ -194,7 +178,7 @@ main (int argc, char **argv )
log_set_prefix ("dirmngr_ldap", JNLIB_LOG_WITH_PREFIX); log_set_prefix ("dirmngr_ldap", JNLIB_LOG_WITH_PREFIX);
/* Setup I18N. */ /* Setup I18N. */
my_i18n_init(); i18n_init();
/* LDAP defaults */ /* LDAP defaults */
opt.timeout.tv_sec = DEFAULT_LDAP_TIMEOUT; opt.timeout.tv_sec = DEFAULT_LDAP_TIMEOUT;