From: Simon Josefsson <simon@josefsson.org>
Date: Mon, 21 May 2012 14:03:01 +0000 (+0200)
Subject: gc: fix libgcrypt detection on older machines.
X-Git-Tag: v0.1~662
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=9eda66890eeedd3157f5733f2fb5ce3e67d1bd5a;p=gnulib.git

gc: fix libgcrypt detection on older machines.

* m4/gc.m4: Reject libgcrypt earlier than 1.4.4.  Collapse
copyright years because the file has been distributed every year
since it was created.
---

diff --git a/ChangeLog b/ChangeLog
index 7dfccd7a2..201dcc4f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-21  Simon Josefsson  <simon@josefsson.org>
+
+	* m4/gc.m4: Reject libgcrypt earlier than 1.4.4.  Collapse
+	copyright years because the file has been distributed every year
+	since it was created.
+
 2012-05-18  Paul Eggert  <eggert@cs.ucla.edu>
 
 	crypto: fix bug in large buffer handling
diff --git a/m4/gc.m4 b/m4/gc.m4
index 8287d5219..1dfeb295b 100644
--- a/m4/gc.m4
+++ b/m4/gc.m4
@@ -1,5 +1,5 @@
-# gc.m4 serial 8
-dnl Copyright (C) 2005-2006, 2009-2012 Free Software Foundation, Inc.
+# gc.m4 serial 9
+dnl Copyright (C) 2005-2012 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -10,6 +10,14 @@ AC_DEFUN([gl_GC],
     AS_HELP_STRING([--with-libgcrypt], [use libgcrypt for low-level crypto]),
     libgcrypt=$withval, libgcrypt=no)
   if test "$libgcrypt" != no; then
-    AC_LIB_HAVE_LINKFLAGS([gcrypt], [gpg-error], [#include <gcrypt.h>])
+    AC_LIB_HAVE_LINKFLAGS([gcrypt], [gpg-error], [
+#include <gcrypt.h>
+/* GCRY_MODULE_ID_USER was added in 1.4.4 and gc-libgcrypt.c
+   will fail on startup if we don't have 1.4.4 or later, so
+   test for it early. */
+#if !defined GCRY_MODULE_ID_USER
+error too old libgcrypt
+#endif
+])
   fi
 ])