crypto/gc-des: Fix recent regression.

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

diff --git a/ChangeLog b/ChangeLog
index 8c88821..84888b4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2011-06-16  Bruno Haible  <bruno@clisp.org>
 
+       crypto/gc-des: Fix recent regression.
+       * modules/crypto/gc-des (Files): Remove m4/des.m4.
+       (configure.ac): Invoke AC_LIBOBJ here.
+       * m4/gc-des.m4 (gl_GC_DES): Don't invoke gl_DES.
+       Reported by Tom G. Christensen <tgc@jupiterrise.com>.
+
        crypto/gc-arcfour: Fix recent regression.
        * modules/crypto/gc-arcfour (Files): Remove m4/arcfour.m4.
        (configure.ac): Invoke AC_LIBOBJ here.

diff --git a/m4/gc-des.m4 b/m4/gc-des.m4
index b63582b..be5bac2 100644 (file)
--- a/m4/gc-des.m4
+++ b/m4/gc-des.m4
@@ -1,4 +1,4 @@
-# gc-des.m4 serial 2
+# gc-des.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_DES],
 [
   AC_REQUIRE([gl_GC])
-  if test "$ac_cv_libgcrypt" != yes; then
-    gl_DES
-  fi
 ])

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