* acinclude.m4 (GNUPG_FIX_HDR_VERSION): Fixed for new automake.

diff --git a/ChangeLog b/ChangeLog
index 828733722ffe562cf4d4949d92d121a66f3ccbd4..9ee15f4214bf71dc0de399861d58f16611f9c795 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-12-18  Werner Koch  <wk@gnupg.org>
+
+       * acinclude.m4 (GNUPG_FIX_HDR_VERSION): Fixed for new automake.
+
 2001-12-14  Marcus Brinkmann  <marcus@g10code.de>
 
        * configure.ac (GPG): Substitute this variable.

diff --git a/TODO b/TODO
index 02b62be368e0e1d396dd2832d91eac90018c052e..f2223248e68eb24abe511d6828cc6b22d34569ab 100644 (file)
--- a/TODO
+++ b/TODO
@@ -48,3 +48,8 @@ Bugs reported by Stephane Corthesy:
 > the  
 > callback has become invalid; if I use a brand new one, the callback  
 > is called recursively, when I ask to enumerate keys.
+
+
+
+
+

diff --git a/acinclude.m4 b/acinclude.m4
index 0952b2fbf26b4fafaf670320f9eb80bedc298fe8..01fe6ba5e1be7c8478369a106dfe6fee25412aa9 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2,25 +2,33 @@ dnl Macros to configure gpgme
 
 
 dnl GNUPG_FIX_HDR_VERSION(FILE, NAME)
-dnl (wk 2000-11-17)
+dnl Make the version number in gcrypt/gcrypt.h the same as the one here.
+dnl (this is easier than to have a .in file just for one substitution)
+dnl We must use a temp file in the current directory because make distcheck 
+dnl install all sourcefiles RO.
+dnl (wk 2001-12-18)
 AC_DEFUN(GNUPG_FIX_HDR_VERSION,
-  [ sed "s/^#define $2 \".*/#define $2 \"$VERSION\"/" $srcdir/$1 > $srcdir/$1.tmp
-    if cmp -s $srcdir/$1 $srcdir/$1.tmp 2>/dev/null; then
-        rm -f $srcdir/$1.tmp
+  [ sed "s/^#define $2 \".*/#define $2 \"$VERSION\"/" $srcdir/$1 > fixhdr.tmp
+    if cmp -s $srcdir/$1 fixhdr.tmp 2>/dev/null; then
+        rm -f fixhdr.tmp
     else
         rm -f $srcdir/$1
-        if mv $srcdir/$1.tmp $srcdir/$1 ; then
+        if mv fixhdr.tmp $srcdir/$1 ; then
             :
         else
             AC_MSG_ERROR([[
+***
 *** Failed to fix the version string macro $2 in $1.
-*** The old file has been saved as $1.tmp
-                         ]])
+*** The old file has been saved as fixhdr.tmp
+***]])
         fi
         AC_MSG_WARN([fixed the $2 macro in $1])
     fi
   ])
 
+
+
+
 dnl GNUPG_CHECK_TYPEDEF(TYPE, HAVE_NAME)
 dnl Check whether a typedef exists and create a #define $2 if it exists
 dnl
@@ -42,3 +50,8 @@ AC_DEFUN(GNUPG_CHECK_TYPEDEF,
 
 
 
+
+
+
+
+