[svn] gcry - r1181 - in trunk: . src

[svn author marcus]

Author: marcus
Date: 2006-10-11 14:01:17 +0200 (Wed, 11 Oct 2006)
New Revision: 1181

Modified:
   trunk/ChangeLog
   trunk/acinclude.m4
   trunk/configure.ac
   trunk/src/ChangeLog
   trunk/src/gcrypt.h.in
Log:
2006-10-11  Marcus Brinkmann  <marcus at 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 at g10code.de>

	* gcrypt.h.in: Replace version by @VERSION at .


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-10-10 18:27:28 UTC (rev 1180)
+++ trunk/ChangeLog	2006-10-11 12:01:17 UTC (rev 1181)
@@ -1,3 +1,8 @@
+2006-10-11  Marcus Brinkmann  <marcus at g10code.de>
+
+	* acinclude.m4 (GNUPG_FIX_HDR_VERSION): Removed.
+	* configure.ac: Do not call GNUPG_FIX_HDR_VERSION.
+
 2006-10-10  Marcus Brinkmann  <marcus at g10code.de>
 
 	* configure.ac: Invoke AC_CHECK_SOCKLEN_TYPE.

Modified: trunk/acinclude.m4
===================================================================
--- trunk/acinclude.m4	2006-10-10 18:27:28 UTC (rev 1180)
+++ trunk/acinclude.m4	2006-10-11 12:01:17 UTC (rev 1181)
@@ -44,32 +44,6 @@
   ])
 
 
-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],

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2006-10-10 18:27:28 UTC (rev 1180)
+++ trunk/configure.ac	2006-10-11 12:01:17 UTC (rev 1181)
@@ -689,12 +689,6 @@
 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)

Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2006-10-10 18:27:28 UTC (rev 1180)
+++ trunk/src/ChangeLog	2006-10-11 12:01:17 UTC (rev 1181)
@@ -1,3 +1,7 @@
+2006-10-11  Marcus Brinkmann  <marcus at g10code.de>
+
+	* gcrypt.h.in: Replace version by @VERSION at .
+
 2006-10-10  Marcus Brinkmann  <marcus at g10code.de>
 
 	* gcrypt.h: Add fallback type for socklen_t.  Move to ...

Modified: trunk/src/gcrypt.h.in
===================================================================
--- trunk/src/gcrypt.h.in	2006-10-10 18:27:28 UTC (rev 1180)
+++ trunk/src/gcrypt.h.in	2006-10-11 12:01:17 UTC (rev 1181)
@@ -54,9 +54,8 @@
    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. */