From: Bruno Haible <bruno@clisp.org>
Date: Thu, 16 Jun 2011 22:53:04 +0000 (+0200)
Subject: crypto/gc-hmac-sha1: Fix recent regression.
X-Git-Tag: v0.1~2255
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=6b91542b2e6a8b1ea5dd4bf0f62208fa4f60143a;p=gnulib.git

crypto/gc-hmac-sha1: Fix recent regression.

* modules/crypto/gc-hmac-sha1 (Files): Remove m4/hmac-sha1.m4.
(configure.ac): Invoke AC_LIBOBJ here.
* m4/gc-hmac-sha1.m4 (gl_GC_HMAC_SHA1): Don't invoke gl_HMAC_SHA1.
Reported by Tom G. Christensen <tgc@jupiterrise.com>.
---

diff --git a/ChangeLog b/ChangeLog
index 1fafdc1f0..6a9580a60 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2011-06-16  Bruno Haible  <bruno@clisp.org>
 
+	crypto/gc-hmac-sha1: Fix recent regression.
+	* modules/crypto/gc-hmac-sha1 (Files): Remove m4/hmac-sha1.m4.
+	(configure.ac): Invoke AC_LIBOBJ here.
+	* m4/gc-hmac-sha1.m4 (gl_GC_HMAC_SHA1): Don't invoke gl_HMAC_SHA1.
+	Reported by Tom G. Christensen <tgc@jupiterrise.com>.
+
 	crypto/gc-hmac-md5: Fix recent regression.
 	* modules/crypto/gc-hmac-md5 (Files): Remove m4/hmac-md5.m4.
 	(configure.ac): Invoke AC_LIBOBJ here.
diff --git a/m4/gc-hmac-sha1.m4 b/m4/gc-hmac-sha1.m4
index f49989faa..dd241b161 100644
--- a/m4/gc-hmac-sha1.m4
+++ b/m4/gc-hmac-sha1.m4
@@ -1,4 +1,4 @@
-# gc-hmac-sha1.m4 serial 2
+# gc-hmac-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,
@@ -9,7 +9,6 @@ AC_DEFUN([gl_GC_HMAC_SHA1],
   AC_REQUIRE([gl_GC])
   if test "$ac_cv_libgcrypt" != yes; then
     gl_SHA1
-    gl_HMAC_SHA1
     gl_MEMXOR
   fi
 ])
diff --git a/modules/crypto/gc-hmac-sha1 b/modules/crypto/gc-hmac-sha1
index 603c28e45..c73351bb1 100644
--- a/modules/crypto/gc-hmac-sha1
+++ b/modules/crypto/gc-hmac-sha1
@@ -8,7 +8,6 @@ lib/sha1.c
 m4/sha1.m4
 lib/hmac.h
 lib/hmac-sha1.c
-m4/hmac-sha1.m4
 lib/memxor.h
 lib/memxor.c
 m4/memxor.m4
@@ -19,6 +18,11 @@ crypto/gc
 
 configure.ac:
 gl_GC_HMAC_SHA1
+if test "$ac_cv_libgcrypt" != yes; then
+  AC_LIBOBJ([sha1])
+  AC_LIBOBJ([hmac-sha1])
+  AC_LIBOBJ([memxor])
+fi
 gl_MODULE_INDICATOR([gc-hmac-sha1])
 
 Makefile.am: