From: Bruno Haible <bruno@clisp.org>
Date: Thu, 16 Jun 2011 23:06:58 +0000 (+0200)
Subject: crypto/gc-sha1: Fix recent regression.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6eedb6a104486c2df4384195e5dfc487d97c5beb;p=pspp

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 c4c273c97e..be2d3fd2b1 100644
--- 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 2fed66bcac..bf30321bf3 100644
--- 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 94a5812319..b9efddaad7 100644
--- 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: