diff options
| author | Marcus Brinkmann <mb@g10code.com> | 2006-10-11 12:01:17 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <mb@g10code.com> | 2006-10-11 12:01:17 +0000 |
| commit | 61ce8d7b0edba1960c173d2bda86fb53faad6c4d (patch) | |
| tree | 153066917c9b80eb1c868aa64100c175c2b43daf | |
| parent | 361c90ef18390d630c57a9acd8136c8d301d9db0 (diff) | |
| download | libgcrypt-61ce8d7b0edba1960c173d2bda86fb53faad6c4d.tar.gz | |
2006-10-11 Marcus Brinkmann <marcus@g10code.de>
* acinclude.m4 (GNUPG_FIX_HDR_VERSION): Removed.
* configure.ac: Do not call GNUPG_FIX_HDR_VERSION.
src/
2006-10-11 Marcus Brinkmann <marcus@g10code.de>
* gcrypt.h.in: Replace version by @VERSION@.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | acinclude.m4 | 26 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/gcrypt.h.in | 5 |
5 files changed, 11 insertions, 35 deletions
@@ -1,3 +1,8 @@ +2006-10-11 Marcus Brinkmann <marcus@g10code.de> + + * acinclude.m4 (GNUPG_FIX_HDR_VERSION): Removed. + * configure.ac: Do not call GNUPG_FIX_HDR_VERSION. + 2006-10-10 Marcus Brinkmann <marcus@g10code.de> * configure.ac: Invoke AC_CHECK_SOCKLEN_TYPE. diff --git a/acinclude.m4 b/acinclude.m4 index af2b2204..d538210d 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -44,32 +44,6 @@ AC_DEFUN([GNUPG_CHECK_TYPEDEF], ]) -dnl GNUPG_FIX_HDR_VERSION(FILE, NAME) -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 -AC_DEFUN([GNUPG_FIX_HDR_VERSION], - [ 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 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 fixhdr.tmp -***]]) - fi - AC_MSG_WARN([fixed the $2 macro in $1]) - fi - ]) - - dnl GNUPG_CHECK_GNUMAKE dnl AC_DEFUN([GNUPG_CHECK_GNUMAKE], diff --git a/configure.ac b/configure.ac index bc6c876b..7aef8f10 100644 --- a/configure.ac +++ b/configure.ac @@ -689,12 +689,6 @@ if test "$GCC" = yes; then fi AC_SUBST(NOEXECSTACK_FLAGS) -# -# Make the version number in src/gcrypt.h the same as the one here. -# (this is easier than to have a *.in file just for one substitution) -# -GNUPG_FIX_HDR_VERSION([src/gcrypt.h], GCRYPT_VERSION) - AC_SUBST(LIBGCRYPT_CONFIG_API_VERSION) AC_SUBST(LIBGCRYPT_CONFIG_LIBS) AC_SUBST(LIBGCRYPT_CONFIG_CFLAGS) diff --git a/src/ChangeLog b/src/ChangeLog index c6f4df44..0286594d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2006-10-11 Marcus Brinkmann <marcus@g10code.de> + + * gcrypt.h.in: Replace version by @VERSION@. + 2006-10-10 Marcus Brinkmann <marcus@g10code.de> * gcrypt.h: Add fallback type for socklen_t. Move to ... diff --git a/src/gcrypt.h.in b/src/gcrypt.h.in index e9debf8b..d63ca6d1 100644 --- a/src/gcrypt.h.in +++ b/src/gcrypt.h.in @@ -54,9 +54,8 @@ extern "C" { should not be used by a program because gcry_check_version() should return the same version. The purpose of this macro is to let autoconf (using the AM_PATH_GCRYPT macro) check that this header - matches the installed library. Note: Do not edit the next line as - configure may fix the string here. */ -#define GCRYPT_VERSION "1.3.0-cvs" + matches the installed library. */ +#define GCRYPT_VERSION "@VERSION@" /* Internal: We can't use the convenience macros for the multi precision integer functions when building this library. */ |