From: Simon Josefsson <simon@josefsson.org>
Date: Wed, 14 Apr 2010 13:23:28 +0000 (+0200)
Subject: lib/gc-libgcrypt.c (gc_init): Use MIN_GCRYPT_VERSION set to version 1.4.4.
X-Git-Tag: v0.1~4258
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=94c98b770ace94c16926e9c383f2e8cc8e4b4e49;p=gnulib.git

lib/gc-libgcrypt.c (gc_init): Use MIN_GCRYPT_VERSION set to version 1.4.4.
---

diff --git a/ChangeLog b/ChangeLog
index f1ccfdc00..1151f3558 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-04-14  Simon Josefsson  <simon@josefsson.org>
+
+	* lib/gc-libgcrypt.c (gc_init): Use MIN_GCRYPT_VERSION set to
+	version 1.4.4 by default instead of requiring the libgcrypt
+	version used during build.  This makes it possible to use the
+	application with older but still binary compatible libgcrypt
+	versions.
+
 2010-04-13  Eric Blake  <eblake@redhat.com>
 
 	getopt-gnu: match recent glibc fixes and posix ruling
diff --git a/lib/gc-libgcrypt.c b/lib/gc-libgcrypt.c
index 1ecc9623a..46a6e5354 100644
--- a/lib/gc-libgcrypt.c
+++ b/lib/gc-libgcrypt.c
@@ -37,6 +37,10 @@
 
 #include <assert.h>
 
+#ifndef MIN_GCRYPT_VERSION
+# define MIN_GCRYPT_VERSION "1.4.4"
+#endif
+
 /* Initialization. */
 
 Gc_rc
@@ -50,7 +54,7 @@ gc_init (void)
       if (gcry_control (GCRYCTL_DISABLE_SECMEM, NULL, 0))
         return GC_INIT_ERROR;
 
-      if (gcry_check_version (GCRYPT_VERSION) == NULL)
+      if (gcry_check_version (MIN_GCRYPT_VERSION) == NULL)
         return GC_INIT_ERROR;
 
       err = gcry_control (GCRYCTL_INITIALIZATION_FINISHED, NULL, 0);