crypto/gc-arcfour: Fix recent regression.

* modules/crypto/gc-arcfour (Files): Remove m4/arcfour.m4.
(configure.ac): Invoke AC_LIBOBJ here.
* m4/gc-arcfour.m4 (gl_GC_ARCFOUR): Don't invoke gl_ARCFOUR.
Reported by Tom G. Christensen <tgc@jupiterrise.com>.

diff --git a/ChangeLog b/ChangeLog
index f2c6ec66d1c90876250c515071623638e444a23e..8c88821baac59fad94b0e321ba519596d3b17682 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-06-16  Bruno Haible  <bruno@clisp.org>
+
+       crypto/gc-arcfour: Fix recent regression.
+       * modules/crypto/gc-arcfour (Files): Remove m4/arcfour.m4.
+       (configure.ac): Invoke AC_LIBOBJ here.
+       * m4/gc-arcfour.m4 (gl_GC_ARCFOUR): Don't invoke gl_ARCFOUR.
+       Reported by Tom G. Christensen <tgc@jupiterrise.com>.
+
 2011-06-16  Paul Eggert  <eggert@cs.ucla.edu>
 
        * m4/lstat.m4 (gl_FUNC_LSTAT): Fix typo in prerequisite.

diff --git a/m4/gc-arcfour.m4 b/m4/gc-arcfour.m4
index 75a68b17182a30192da7432d089c3d2848d23356..2defdc96f2dd99101b8abb3d542877af60e75843 100644 (file)
--- a/m4/gc-arcfour.m4
+++ b/m4/gc-arcfour.m4
@@ -1,4 +1,4 @@
-# gc-arcfour.m4 serial 2
+# gc-arcfour.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 @@ dnl with or without modifications, as long as this notice is preserved.
 AC_DEFUN([gl_GC_ARCFOUR],
 [
   AC_REQUIRE([gl_GC])
-  if test "$ac_cv_libgcrypt" != yes; then
-    gl_ARCFOUR
-  fi
 ])

diff --git a/modules/crypto/gc-arcfour b/modules/crypto/gc-arcfour
index 0d1c3b01dbc0f7b6a968a1bf5092b5b8531da17a..34a310c60f4dac562902f275b7f41ecbab0619fb 100644 (file)
--- a/modules/crypto/gc-arcfour
+++ b/modules/crypto/gc-arcfour
@@ -5,7 +5,6 @@ Files:
 m4/gc-arcfour.m4
 lib/arcfour.h
 lib/arcfour.c
-m4/arcfour.m4
 
 Depends-on:
 stdint
@@ -13,6 +12,9 @@ crypto/gc
 
 configure.ac:
 gl_GC_ARCFOUR
+if test "$ac_cv_libgcrypt" != yes; then
+  AC_LIBOBJ([arcfour])
+fi
 gl_MODULE_INDICATOR([gc-arcfour])
 
 Makefile.am: