From: Bruno Haible <bruno@clisp.org>
Date: Thu, 16 Jun 2011 23:00:39 +0000 (+0200)
Subject: crypto/gc-arctwo: Fix recent regression.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;ds=inline;h=0b3b74d5643737f6e78f93a40f34462baee64131;p=pspp

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 39a83f5e32..a51ddbae2e 100644
--- 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 9f95f59f4f..5172730d4a 100644
--- 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 b26540203c..49006679f6 100644
--- 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: