GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Werner Koch 2001-12-18 18:46:00 +00:00
parent d1384aabc5
commit ac53a44dfa
3 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -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> 2001-12-14 Marcus Brinkmann <marcus@g10code.de>
* configure.ac (GPG): Substitute this variable. * configure.ac (GPG): Substitute this variable.

5
TODO
View File

@ -48,3 +48,8 @@ Bugs reported by Stephane Corthesy:
> the > the
> callback has become invalid; if I use a brand new one, the callback > callback has become invalid; if I use a brand new one, the callback
> is called recursively, when I ask to enumerate keys. > is called recursively, when I ask to enumerate keys.

27
acinclude.m4
View File

@ -2,25 +2,33 @@ dnl Macros to configure gpgme
dnl GNUPG_FIX_HDR_VERSION(FILE, NAME) 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, AC_DEFUN(GNUPG_FIX_HDR_VERSION,
[ sed "s/^#define $2 \".*/#define $2 \"$VERSION\"/" $srcdir/$1 > $srcdir/$1.tmp [ sed "s/^#define $2 \".*/#define $2 \"$VERSION\"/" $srcdir/$1 > fixhdr.tmp
if cmp -s $srcdir/$1 $srcdir/$1.tmp 2>/dev/null; then if cmp -s $srcdir/$1 fixhdr.tmp 2>/dev/null; then
rm -f $srcdir/$1.tmp rm -f fixhdr.tmp
else else
rm -f $srcdir/$1 rm -f $srcdir/$1
if mv $srcdir/$1.tmp $srcdir/$1 ; then if mv fixhdr.tmp $srcdir/$1 ; then
: :
else else
AC_MSG_ERROR([[ AC_MSG_ERROR([[
***
*** Failed to fix the version string macro $2 in $1. *** 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 fi
AC_MSG_WARN([fixed the $2 macro in $1]) AC_MSG_WARN([fixed the $2 macro in $1])
fi fi
]) ])
dnl GNUPG_CHECK_TYPEDEF(TYPE, HAVE_NAME) dnl GNUPG_CHECK_TYPEDEF(TYPE, HAVE_NAME)
dnl Check whether a typedef exists and create a #define $2 if it exists dnl Check whether a typedef exists and create a #define $2 if it exists
dnl dnl
@ -42,3 +50,8 @@ AC_DEFUN(GNUPG_CHECK_TYPEDEF,