diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/gpgme-tool.c | 2 |
4 files changed, 11 insertions, 0 deletions
@@ -1,3 +1,7 @@ +2010-05-12 Marcus Brinkmann <[email protected]> + + * configure.ac: Check for setlocale. + 2010-05-07 Werner Koch <[email protected]> * configure.ac: Change checks to always require libassuan. diff --git a/configure.ac b/configure.ac index 300b2292..cb22e523 100644 --- a/configure.ac +++ b/configure.ac @@ -295,6 +295,8 @@ if test "$ac_cv_func_timegm" != yes; then ***]) fi +AC_CHECK_FUNCS(setlocale) + # Checking for libgpg-error. AM_PATH_GPG_ERROR(1.8,, AC_MSG_ERROR([libgpg-error was not found])) AC_DEFINE(GPG_ERR_SOURCE_DEFAULT, GPG_ERR_SOURCE_GPGME, diff --git a/src/ChangeLog b/src/ChangeLog index a832b0f9..14b168b2 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2010-05-12 Marcus Brinkmann <[email protected]> + * gpgme-tool.c (main): Protect call to setlocale with + HAVE_SETLOCALE. + * Makefile.am (system_components): Remove custom cppflags from RCCOMPILE (because gpg-error adds -idirafter that makes RC bail. [HAVE_W32CE_SYSTEM]: Add w32-ce.h and w32-ce.c, clear diff --git a/src/gpgme-tool.c b/src/gpgme-tool.c index f102979d..0f16aac2 100644 --- a/src/gpgme-tool.c +++ b/src/gpgme-tool.c @@ -2908,7 +2908,9 @@ main (int argc, char *argv[]) struct args args; struct gpgme_tool gt; +#ifdef HAVE_SETLOCALE setlocale (LC_ALL, ""); +#endif gpgme_check_version (NULL); #ifdef LC_CTYPE gpgme_set_locale (NULL, LC_CTYPE, setlocale (LC_CTYPE, NULL)); |