crypto/gc-sha1: Fix recent regression.

* modules/crypto/gc-sha1 (configure.ac): Invoke AC_LIBOBJ here.
* m4/gc-sha1.m4 (gl_GC_SHA1): Don't invoke gl_SHA1.

diff --git a/ChangeLog b/ChangeLog
index c4c273c97e9dcc46c08432d2de99eadf17a30dbb..be2d3fd2b1d5c5f2fbedbf1f1d779b7224a6ac45 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-06-16  Bruno Haible  <bruno@clisp.org>
 
+       crypto/gc-sha1: Fix recent regression.
+       * modules/crypto/gc-sha1 (configure.ac): Invoke AC_LIBOBJ here.
+       * m4/gc-sha1.m4 (gl_GC_SHA1): Don't invoke gl_SHA1.
+
        crypto/gc-md5: Fix recent regression.
        * modules/crypto/gc-md5 (configure.ac): Invoke AC_LIBOBJ here.
 

diff --git a/m4/gc-sha1.m4 b/m4/gc-sha1.m4
index 2fed66bcacb876bb47a45abce94ed314569d9983..bf30321bf3ee082a60158682fa2d5e25f48ff3d6 100644 (file)
--- a/m4/gc-sha1.m4
+++ b/m4/gc-sha1.m4
@@ -1,4 +1,4 @@
-# gc-sha1.m4 serial 2
+# gc-sha1.m4 serial 3
 dnl Copyright (C) 2005, 2007, 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,
@@ -7,7 +7,4 @@ dnl with or without modifications, as long as this notice is preserved.
 AC_DEFUN([gl_GC_SHA1],
 [
   AC_REQUIRE([gl_GC])
-  if test "$ac_cv_libgcrypt" != yes; then
-    gl_SHA1
-  fi
 ])

diff --git a/modules/crypto/gc-sha1 b/modules/crypto/gc-sha1
index 94a5812319cb0e7e034f5507226ebf6f8434d70e..b9efddaad7db30018f3780008d9d28c75eadfd01 100644 (file)
--- a/modules/crypto/gc-sha1
+++ b/modules/crypto/gc-sha1
@@ -13,6 +13,9 @@ crypto/gc
 
 configure.ac:
 gl_GC_SHA1
+if test "$ac_cv_libgcrypt" != yes; then
+  AC_LIBOBJ([sha1])
+fi
 gl_MODULE_INDICATOR([gc-sha1])
 
 Makefile.am: