[svn] gpgme - r1472 - in trunk: . src

[svn author marcus]

Author: marcus
Date: 2010-05-12 19:40:08 +0200 (Wed, 12 May 2010)
New Revision: 1472

Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/src/ChangeLog
   trunk/src/gpgme-tool.c
Log:
2010-05-12  Marcus Brinkmann  <marcus at g10code.de>

	* configure.ac: Check for setlocale.

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

	* gpgme-tool.c (main): Protect call to setlocale with
	HAVE_SETLOCALE.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-05-12 17:21:36 UTC (rev 1471)
+++ trunk/ChangeLog	2010-05-12 17:40:08 UTC (rev 1472)
@@ -1,3 +1,7 @@
+2010-05-12  Marcus Brinkmann  <marcus at g10code.de>
+
+	* configure.ac: Check for setlocale.
+
 2010-05-07  Werner Koch  <wk at g10code.com>
 
 	* configure.ac: Change checks to always require libassuan.

Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2010-05-12 17:21:36 UTC (rev 1471)
+++ trunk/src/ChangeLog	2010-05-12 17:40:08 UTC (rev 1472)
@@ -1,5 +1,8 @@
 2010-05-12  Marcus Brinkmann  <marcus at g10code.de>
 
+	* 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

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2010-05-12 17:21:36 UTC (rev 1471)
+++ trunk/configure.ac	2010-05-12 17:40:08 UTC (rev 1472)
@@ -295,6 +295,8 @@
 ***])
 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,

Modified: trunk/src/gpgme-tool.c
===================================================================
--- trunk/src/gpgme-tool.c	2010-05-12 17:21:36 UTC (rev 1471)
+++ trunk/src/gpgme-tool.c	2010-05-12 17:40:08 UTC (rev 1472)
@@ -2908,7 +2908,9 @@
   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));