Mercurial > hg > octave-lojdl > gnulib-hg

changeset 15273:8f6fd6b9cdd2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
crypto/gc-arctwo: Fix recent regression. * modules/crypto/gc-arctwo (configure.ac): Invoke AC_LIBOBJ here. * m4/arctwo.m4 (gl_ARCTWO): Ensure the expansion is non-empty.
author Bruno Haible <bruno@clisp.org>
date Fri, 17 Jun 2011 01:00:39 +0200
parents d12c6feef598
children 0de399fca8eb
files ChangeLog m4/arctwo.m4 modules/crypto/gc-arctwo
diffstat 3 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-06-16  Bruno Haible  <bruno@clisp.org>
 
+	crypto/gc-arctwo: Fix recent regression.
+	* modules/crypto/gc-arctwo (configure.ac): Invoke AC_LIBOBJ here.
+	* m4/arctwo.m4 (gl_ARCTWO): Ensure the expansion is non-empty.
+
 	crypto/gc-rijndael: Fix recent regression.
 	* modules/crypto/gc-rijndael (Files): Remove m4/rijndael.m4.
 	(configure.ac): Invoke AC_LIBOBJ here.
--- a/m4/arctwo.m4
+++ b/m4/arctwo.m4
@@ -1,4 +1,4 @@
-# arctwo.m4 serial 3
+# arctwo.m4 serial 4
 dnl Copyright (C) 2005-2006, 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,
@@ -8,4 +8,5 @@
 AC_DEFUN([gl_ARCTWO],
 [
   AC_REQUIRE([AC_C_INLINE])
+  :
 ])
--- a/modules/crypto/gc-arctwo
+++ b/modules/crypto/gc-arctwo
@@ -14,6 +14,9 @@
 
 configure.ac:
 gl_GC_ARCTWO
+if test "$ac_cv_libgcrypt" != yes; then
+  AC_LIBOBJ([arctwo])
+fi
 gl_MODULE_INDICATOR([gc-arctwo])
 
 Makefile.am: