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 1fafdc1f095f477984d69658eb76002b909bc930..6a9580a60344b205ea45bf2ae066d5344658e6d2 100644 (file)
--- 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 f49989faabe885446c9ee196998fc47d4de77c2f..dd241b1615991f73106b539e200c9322296443f2 100644 (file)
--- 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 603c28e4591a13c4861411b853a8f5a92d99407a..c73351bb1179d6ac35eef910559d7050ac5da5cf 100644 (file)
--- 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: