diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | TODO | 5 | ||||
| -rw-r--r-- | acinclude.m4 | 27 |
3 files changed, 29 insertions, 7 deletions
@@ -1,3 +1,7 @@ +2001-12-18 Werner Koch <[email protected]> + + * acinclude.m4 (GNUPG_FIX_HDR_VERSION): Fixed for new automake. + 2001-12-14 Marcus Brinkmann <[email protected]> * configure.ac (GPG): Substitute this variable. @@ -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 0952b2fb..01fe6ba5 100644 --- 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, + + + + + |