From 96f8fde75f5197ff2d68e616ef41532b96fba64f Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 17 Jun 2011 00:47:09 +0200 Subject: [PATCH] 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 . --- ChangeLog | 6 ++++++ m4/gc-des.m4 | 5 +---- modules/crypto/gc-des | 4 +++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8c88821baa..84888b4f6d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2011-06-16 Bruno Haible + 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 . + 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 b63582bcb3..be5bac2c49 100644 --- 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 9d58dff57e..fd7cb764c4 100644 --- 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: -- 2.30.2