Mercurial > hg > octave-lojdl > gnulib-hg

changeset 15276:a223b1671bad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Bruno Haible <bruno@clisp.org>
date Fri, 17 Jun 2011 01:06:58 +0200
parents 82301ffbf6b9
children 950cb86b9e65
files ChangeLog m4/gc-sha1.m4 modules/crypto/gc-sha1
diffstat 3 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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.
 
--- 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 @@
 AC_DEFUN([gl_GC_SHA1],
 [
   AC_REQUIRE([gl_GC])
-  if test "$ac_cv_libgcrypt" != yes; then
-    gl_SHA1
-  fi
 ])
--- a/modules/crypto/gc-sha1
+++ b/modules/crypto/gc-sha1
@@ -13,6 +13,9 @@
 
 configure.ac:
 gl_GC_SHA1
+if test "$ac_cv_libgcrypt" != yes; then
+  AC_LIBOBJ([sha1])
+fi
 gl_MODULE_INDICATOR([gc-sha1])
 
 Makefile.am: