Mercurial > hg > octave-lojdl > gnulib-hg

changeset 15269:a86a7b1c29a0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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>.
author Bruno Haible <bruno@clisp.org>
date Fri, 17 Jun 2011 00:47:09 +0200
parents a36b75afc610
children d5aa06ef8fb9
files ChangeLog m4/gc-des.m4 modules/crypto/gc-des
diffstat 3 files changed, 10 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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.
--- 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 @@
 AC_DEFUN([gl_GC_DES],
 [
   AC_REQUIRE([gl_GC])
-  if test "$ac_cv_libgcrypt" != yes; then
-    gl_DES
-  fi
 ])
--- a/modules/crypto/gc-des
+++ b/modules/crypto/gc-des
@@ -5,7 +5,6 @@
 m4/gc-des.m4
 lib/des.h
 lib/des.c
-m4/des.m4
 
 Depends-on:
 stdint
@@ -14,6 +13,9 @@
 
 configure.ac:
 gl_GC_DES
+if test "$ac_cv_libgcrypt" != yes; then
+  AC_LIBOBJ([des])
+fi
 gl_MODULE_INDICATOR([gc-des])
 
 Makefile.am: