summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorSimon Josefsson <simon@josefsson.org>2012-05-21 16:03:01 +0200
committerSimon Josefsson <simon@josefsson.org>2012-05-21 16:03:01 +0200
commit9eda66890eeedd3157f5733f2fb5ce3e67d1bd5a (patch)
tree787925e004d5014be13e9e7c1cf7bcd10fbf925d /m4
parent5bde137d4911eb44fabcc394b4a7c29a4f3a5de6 (diff)
downloadgnulib-9eda66890eeedd3157f5733f2fb5ce3e67d1bd5a.tar.gz
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.
Diffstat (limited to 'm4')
-rw-r--r--m4/gc.m414
1 files changed, 11 insertions, 3 deletions
diff --git a/m4/gc.m4 b/m4/gc.m4
index 8287d52190..1dfeb295b2 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
])