X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fgc.m4;h=b352e337ccc271bdb9a237fb631cbdc4ea18c7af;hb=bba1410c5853394a80c9abb74a9a665893336caf;hp=f237d8dd3713efa7e3846551d898d09e4a1fd24e;hpb=fa353b4b7a2f57da6bda5090b7521142bd6cb2a2;p=gnulib.git

diff --git a/m4/gc.m4 b/m4/gc.m4
index f237d8dd3..b352e337c 100644
--- a/m4/gc.m4
+++ b/m4/gc.m4
@@ -1,5 +1,5 @@
-# gc.m4 serial 6
-dnl Copyright (C) 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
+# gc.m4 serial 9
+dnl Copyright (C) 2005-2013 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,18 +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>])
-  fi
-  if test "$ac_cv_libgcrypt" = yes; then
-    AC_LIBOBJ([gc-libgcrypt])
-  else
-    AC_LIBOBJ([gc-gnulib])
-  fi
+    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
 ])
-
-# Prerequisites of lib/gc.h
-AC_DEFUN([gl_PREREQ_GC],
-[
-  AC_REQUIRE([AC_C_RESTRICT])
-  :
+  fi
 ])