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

diff --git a/m4/gc.m4 b/m4/gc.m4
index e01ae29d6..a309010eb 100644
--- a/m4/gc.m4
+++ b/m4/gc.m4
@@ -1,17 +1,16 @@
-# gc.m4 serial 2
-dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+# gc.m4 serial 6
+dnl Copyright (C) 2005-2006, 2009-2011 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>])
+    AC_LIB_HAVE_LINKFLAGS([gcrypt], [gpg-error], [#include <gcrypt.h>])
   fi
   if test "$ac_cv_libgcrypt" = yes; then
     AC_LIBOBJ([gc-libgcrypt])
@@ -21,4 +20,8 @@ AC_DEFUN([gl_GC],
 ])
 
 # Prerequisites of lib/gc.h
-AC_DEFUN([gl_PREREQ_GC], [:])
+AC_DEFUN([gl_PREREQ_GC],
+[
+  AC_REQUIRE([AC_C_RESTRICT])
+  :
+])