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.

diff --git a/ChangeLog b/ChangeLog
index 39a83f5e328581c7bb148fd7dd31e9be2c8b0d29..a51ddbae2e32131a71bbefa3e0109a4566c13d5b 100644 (file)
--- 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.

diff --git a/m4/arctwo.m4 b/m4/arctwo.m4
index 9f95f59f4f38ae76eabab2bb32827ef1eb4797eb..5172730d4a8e240ca9a6e05dfae38eb5c7aec5fa 100644 (file)
--- 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 @@ dnl with or without modifications, as long as this notice is preserved.
 AC_DEFUN([gl_ARCTWO],
 [
   AC_REQUIRE([AC_C_INLINE])
+  :
 ])

diff --git a/modules/crypto/gc-arctwo b/modules/crypto/gc-arctwo
index b26540203c959bad0601c69b239a3527012c476c..49006679f67125115409f99ccce06959015aeee0 100644 (file)
--- a/modules/crypto/gc-arctwo
+++ b/modules/crypto/gc-arctwo
@@ -14,6 +14,9 @@ bitrotate
 
 configure.ac:
 gl_GC_ARCTWO
+if test "$ac_cv_libgcrypt" != yes; then
+  AC_LIBOBJ([arctwo])
+fi
 gl_MODULE_INDICATOR([gc-arctwo])
 
 Makefile.am: