From 20fd200278b4e3f7b4a5070b5e178e61895aab31 Mon Sep 17 00:00:00 2001 From: Bruno Haible <bruno@clisp.org> Date: Fri, 17 Jun 2011 00:56:44 +0200 Subject: [PATCH] crypto/gc-rijndael: Fix recent regression. * modules/crypto/gc-rijndael (Files): Remove m4/rijndael.m4. (configure.ac): Invoke AC_LIBOBJ here. * m4/gc-rijndael.m4 (gl_GC_RIJNDAEL): Don't invoke gl_RIJNDAEL. Reported by Tom G. Christensen <tgc@jupiterrise.com>. --- ChangeLog | 6 ++++++ m4/gc-rijndael.m4 | 5 +---- modules/crypto/gc-rijndael | 5 ++++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6a9580a603..39a83f5e32 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2011-06-16 Bruno Haible <bruno@clisp.org> + crypto/gc-rijndael: Fix recent regression. + * modules/crypto/gc-rijndael (Files): Remove m4/rijndael.m4. + (configure.ac): Invoke AC_LIBOBJ here. + * m4/gc-rijndael.m4 (gl_GC_RIJNDAEL): Don't invoke gl_RIJNDAEL. + Reported by Tom G. Christensen <tgc@jupiterrise.com>. + crypto/gc-hmac-sha1: Fix recent regression. * modules/crypto/gc-hmac-sha1 (Files): Remove m4/hmac-sha1.m4. (configure.ac): Invoke AC_LIBOBJ here. diff --git a/m4/gc-rijndael.m4 b/m4/gc-rijndael.m4 index 8fd93f5e34..709427d993 100644 --- a/m4/gc-rijndael.m4 +++ b/m4/gc-rijndael.m4 @@ -1,4 +1,4 @@ -# gc-rijndael.m4 serial 2 +# gc-rijndael.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_RIJNDAEL], [ AC_REQUIRE([gl_GC]) - if test "$ac_cv_libgcrypt" != yes; then - gl_RIJNDAEL - fi ]) diff --git a/modules/crypto/gc-rijndael b/modules/crypto/gc-rijndael index bfcd48e1a2..e01e12d332 100644 --- a/modules/crypto/gc-rijndael +++ b/modules/crypto/gc-rijndael @@ -7,7 +7,6 @@ lib/rijndael-alg-fst.c lib/rijndael-alg-fst.h lib/rijndael-api-fst.c lib/rijndael-api-fst.h -m4/rijndael.m4 Depends-on: stdint @@ -15,6 +14,10 @@ crypto/gc configure.ac: gl_GC_RIJNDAEL +if test "$ac_cv_libgcrypt" != yes; then + AC_LIBOBJ([rijndael-alg-fst]) + AC_LIBOBJ([rijndael-api-fst]) +fi gl_MODULE_INDICATOR([gc-rijndael]) Makefile.am: -- 2.30.2