X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=m4%2Fgc.m4;h=b352e337ccc271bdb9a237fb631cbdc4ea18c7af;hb=8866a241ddbf4a459347b7147e325f539e4c07fe;hp=e01ae29d614bc84e7ee51bf45f0e31e6f9befbcd;hpb=216c04af3d0ae20181e266391d1bdc09c120404c;p=gnulib.git

diff --git a/m4/gc.m4 b/m4/gc.m4
index e01ae29d6..b352e337c 100644
--- a/m4/gc.m4
+++ b/m4/gc.m4
@@ -1,24 +1,23 @@
-# gc.m4 serial 2
-dnl Copyright (C) 2005, 2006 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.
 
 AC_DEFUN([gl_GC],
 [
-  AC_LIBSOURCES([gc.h, gc-gnulib.c, gc-libgcrypt.c])
-  AC_ARG_WITH(libgcrypt,
+  AC_ARG_WITH([libgcrypt],
     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], [], [#include <gcrypt.h>])
-  fi
-  if test "$ac_cv_libgcrypt" = yes; then
-    AC_LIBOBJ([gc-libgcrypt])
-  else
-    AC_LIBOBJ([gc-gnulib])
+    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
 ])
-
-# Prerequisites of lib/gc.h
-AC_DEFUN([gl_PREREQ_GC], [:])