GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2010-05-12 Marcus Brinkmann <marcus@g10code.de>

Browse Source 
* configure.ac: Check for setlocale.

src/
2010-05-12  Marcus Brinkmann  <marcus@g10code.de>

	* gpgme-tool.c (main): Protect call to setlocale with
	HAVE_SETLOCALE.
This commit is contained in:
Marcus Brinkmann 2010-05-12 17:40:08 +00:00
parent ca3e5c63b9
commit 8d27defa02
4 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2010-05-12 Marcus Brinkmann <marcus@g10code.de>
* configure.ac: Check for setlocale.
2010-05-07 Werner Koch <wk@g10code.com> 2010-05-07 Werner Koch <wk@g10code.com>
* configure.ac: Change checks to always require libassuan. * configure.ac: Change checks to always require libassuan.

2
configure.ac
View File

@ -295,6 +295,8 @@ if test "$ac_cv_func_timegm" != yes; then
***]) ***])
fi fi
AC_CHECK_FUNCS(setlocale)
# Checking for libgpg-error. # Checking for libgpg-error.
AM_PATH_GPG_ERROR(1.8,, AC_MSG_ERROR([libgpg-error was not found])) AM_PATH_GPG_ERROR(1.8,, AC_MSG_ERROR([libgpg-error was not found]))
AC_DEFINE(GPG_ERR_SOURCE_DEFAULT, GPG_ERR_SOURCE_GPGME, AC_DEFINE(GPG_ERR_SOURCE_DEFAULT, GPG_ERR_SOURCE_GPGME,

3
src/ChangeLog
View File

@ -1,5 +1,8 @@
2010-05-12 Marcus Brinkmann <marcus@g10code.de> 2010-05-12 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (main): Protect call to setlocale with
HAVE_SETLOCALE.
* Makefile.am (system_components): Remove custom cppflags from * Makefile.am (system_components): Remove custom cppflags from
RCCOMPILE (because gpg-error adds -idirafter that makes RC bail. RCCOMPILE (because gpg-error adds -idirafter that makes RC bail.
[HAVE_W32CE_SYSTEM]: Add w32-ce.h and w32-ce.c, clear [HAVE_W32CE_SYSTEM]: Add w32-ce.h and w32-ce.c, clear

2
src/gpgme-tool.c
View File

@ -2908,7 +2908,9 @@ main (int argc, char *argv[])
struct args args; struct args args;
struct gpgme_tool gt; struct gpgme_tool gt;
#ifdef HAVE_SETLOCALE
setlocale (LC_ALL, ""); setlocale (LC_ALL, "");
#endif
gpgme_check_version (NULL); gpgme_check_version (NULL);
#ifdef LC_CTYPE #ifdef LC_CTYPE
gpgme_set_locale (NULL, LC_CTYPE, setlocale (LC_CTYPE, NULL)); gpgme_set_locale (NULL, LC_CTYPE, setlocale (LC_CTYPE, NULL));