[svn] gpg-error - r247 - in trunk: . src

[svn author wk]

Author: wk
Date: 2010-08-19 15:39:12 +0200 (Thu, 19 Aug 2010)
New Revision: 247

Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/autogen.sh
   trunk/configure.ac
   trunk/src/w32ce-add.h
Log:
Require new GPG_ERR_ENABLE_ERRNO_MACROS define to include the strerror
define.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-07-21 08:12:25 UTC (rev 246)
+++ trunk/ChangeLog	2010-08-19 13:39:12 UTC (rev 247)
@@ -1,3 +1,9 @@
+2010-08-19  Werner Koch  <wk at g10code.com>
+
+	* configure.ac (AH_BOTTOM): Define GPG_ERR_ENABLE_ERRNO_MACROS.
+	* src/w32ce-add.h (strerror) [!GPG_ERR_ENABLE_ERRNO_MACROS]:  Do
+	not define.
+
 2010-07-21  Werner Koch  <wk at g10code.com>
 
 	Release 1.9.

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2010-07-21 08:12:25 UTC (rev 246)
+++ trunk/NEWS	2010-08-19 13:39:12 UTC (rev 247)
@@ -1,3 +1,10 @@
+Noteworthy changes in version 1.10
+----------------------------------------------
+
+ * Interface changes relative to the 1.9 release:
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
 Noteworthy changes in version 1.9 (2010-07-21)
 ----------------------------------------------
 

Modified: trunk/autogen.sh
===================================================================
--- trunk/autogen.sh	2010-07-21 08:12:25 UTC (rev 246)
+++ trunk/autogen.sh	2010-08-19 13:39:12 UTC (rev 247)
@@ -125,7 +125,7 @@
         fi
     fi
 
-    ./configure --enable-maintainer-mode  --prefix=${w32root}  \
+    $tsdir/configure --enable-maintainer-mode  --prefix=${w32root}  \
             --host=${host} --build=${build} "$@"
 
     exit $?

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2010-07-21 08:12:25 UTC (rev 246)
+++ trunk/configure.ac	2010-08-19 13:39:12 UTC (rev 247)
@@ -24,8 +24,8 @@
 # Remember to change the version number immediately *after* a release.
 # Set my_issvn to "yes" for non-released code.  Remember to run an
 # "svn up" and "autogen.sh" right before creating a distribution.
-m4_define([my_version], [1.9])
-m4_define([my_issvn], [no])
+m4_define([my_version], [1.10])
+m4_define([my_issvn], [yes])
 
 m4_define([svn_revision], m4_esyscmd([printf "%d" $(svn info 2>/dev/null \
           | sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)]))
@@ -105,8 +105,9 @@
 #if defined(HAVE_W32_SYSTEM) && !defined(ENABLE_NLS)
 #define ENABLE_NLS 1
 #endif
-/* For building we need to define this macro.  */
-#define GPG_ERR_ENABLE_GETTEXT_MACROS
+/* For building we need to define these macro.  */
+#define GPG_ERR_ENABLE_GETTEXT_MACROS 1
+#define GPG_ERR_ENABLE_ERRNO_MACROS 1
 ])
 
 

Modified: trunk/src/w32ce-add.h
===================================================================
--- trunk/src/w32ce-add.h	2010-07-21 08:12:25 UTC (rev 246)
+++ trunk/src/w32ce-add.h	2010-08-19 13:39:12 UTC (rev 247)
@@ -3,5 +3,6 @@
 
 /* Substitute for strerror - this one is thread safe.  */
 char *_gpg_w32ce_strerror (int err);
-#define strerror(a) _gpg_w32ce_strerror (a)
-
+#ifdef GPG_ERR_ENABLE_ERRNO_MACROS
+# define strerror(a) _gpg_w32ce_strerror (a)
+#endif