X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fgc.m4;h=ea076e9e4a3d87b2d510159b7b41ca21d7e9f04c;hb=4b40eab91d0e7b3aaf69ba51ab236c079c904649;hp=359b9f12ad54884e8cd72d24d7f801040000877b;hpb=3e1218682966f9d8f92240d4185cc2218d7bf29f;p=gnulib.git

diff --git a/m4/gc.m4 b/m4/gc.m4
index 359b9f12a..ea076e9e4 100644
--- a/m4/gc.m4
+++ b/m4/gc.m4
@@ -1,28 +1,15 @@
-# gc.m4 serial 3
-dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+# gc.m4 serial 8
+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])
-  else
-    AC_LIBOBJ([gc-gnulib])
-  fi
-])
-
-# Prerequisites of lib/gc.h
-AC_DEFUN([gl_PREREQ_GC],
-[
-  AC_REQUIRE([AC_C_RESTRICT])
-  :
 ])