[GNUnet-SVN] r24024 - in gnunet: . src/util

[gnunet]

Author: grothoff
Date: 2012-09-26 22:16:30 +0200 (Wed, 26 Sep 2012)
New Revision: 24024

Modified:
   gnunet/configure.ac
   gnunet/src/util/crypto_random.c
Log:
releaxing libgcrypt version check, fixing Debian #684997

Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2012-09-26 15:18:37 UTC (rev 24023)
+++ gnunet/configure.ac 2012-09-26 20:16:30 UTC (rev 24024)
@@ -221,13 +221,25 @@
 
 # libgcrypt
 gcrypt=0
-AM_PATH_LIBGCRYPT(1.2.0, gcrypt=1)
+NEED_LIBGCRYPT_API=1
+NEED_LIBGCRYPT_VERSION=1.4.2
+
+
+AM_PATH_LIBGCRYPT("$NEED_LIBGCRYPT_API:$NEED_LIBGCRYPT_VERSION", gcrypt=1)
 AC_CHECK_DECLS([gcry_mpi_lshift], [], [], [[#include <gcrypt.h>]])
 
 if test $gcrypt = 0
 then
-  AC_MSG_ERROR([GNUnet needs libgcrypt])
+  AC_MSG_ERROR([[
+***
+*** You need libgcrypt to build this program.
+**  This library is for example available at
+***   ftp://ftp.gnupg.org/gcrypt/libgcrypt/
+*** (at least version $NEED_LIBGCRYPT_VERSION (API $NEED_LIBGCRYPT_API) 
+***  is required.)
+***]])
 fi
+AC_DEFINE_UNQUOTED([NEED_LIBGCRYPT_VERSION], "$NEED_LIBGCRYPT_VERSION", 
[required libgcrypt version])
 
 # Adam shostack suggests the following for Windows:
 # -D_FORTIFY_SOURCE=2 -fstack-protector-all

Modified: gnunet/src/util/crypto_random.c
===================================================================
--- gnunet/src/util/crypto_random.c     2012-09-26 15:18:37 UTC (rev 24023)
+++ gnunet/src/util/crypto_random.c     2012-09-26 20:16:30 UTC (rev 24024)
@@ -335,12 +335,12 @@
 void __attribute__ ((constructor)) GNUNET_CRYPTO_random_init ()
 {
   gcry_control (GCRYCTL_DISABLE_SECMEM, 0);
-  if (!gcry_check_version (GCRYPT_VERSION))
+  if (!gcry_check_version (NEED_LIBGCRYPT_VERSION))
   {
     FPRINTF (stderr,
              _
              ("libgcrypt has not the expected version (version %s is 
required).\n"),
-             GCRYPT_VERSION);
+             NEED_LIBGCRYPT_VERSION);
     GNUNET_abort ();
   }
 #ifdef GCRYCTL_INITIALIZATION_FINISHED