From a160ddd577f693f9cb97efec502b587877917bc3 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Thu, 19 Aug 2010 13:39:12 +0000
Subject: Require new GPG_ERR_ENABLE_ERRNO_MACROS define to include the
 strerror define.

---
 ChangeLog       | 6 ++++++
 NEWS            | 7 +++++++
 autogen.sh      | 2 +-
 configure.ac    | 9 +++++----
 src/w32ce-add.h | 5 +++--
 5 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5f97561..86217c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-19  Werner Koch  <wk@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@g10code.com>
 
 	Release 1.9.
diff --git a/NEWS b/NEWS
index 4bebba3..67fc2f1 100644
--- a/NEWS
+++ b/NEWS
@@ -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)
 ----------------------------------------------
 
diff --git a/autogen.sh b/autogen.sh
index 70e02ed..48da7f7 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -125,7 +125,7 @@ if [ "$myhost" = "w32" ]; then
         fi
     fi
 
-    ./configure --enable-maintainer-mode  --prefix=${w32root}  \
+    $tsdir/configure --enable-maintainer-mode  --prefix=${w32root}  \
             --host=${host} --build=${build} "$@"
 
     exit $?
diff --git a/configure.ac b/configure.ac
index b38ab68..a4e1e8f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,8 +24,8 @@ min_automake_version="1.9.6"
 # 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 @@ AH_BOTTOM([
 #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
 ])
 
 
diff --git a/src/w32ce-add.h b/src/w32ce-add.h
index 83b7538..c6207bb 100644
--- a/src/w32ce-add.h
+++ b/src/w32ce-add.h
@@ -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
-- 
cgit v1.2.3