From 395cc914b59ca1fdefeadf3b63f45d1c48ee2b50 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 17 Jun 2011 00:44:56 +0200 Subject: [PATCH] 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 . --- ChangeLog | 8 ++++++++ m4/gc-arcfour.m4 | 5 +---- modules/crypto/gc-arcfour | 4 +++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index f2c6ec66d..8c88821ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2011-06-16 Bruno Haible + + 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 . + 2011-06-16 Paul Eggert * m4/lstat.m4 (gl_FUNC_LSTAT): Fix typo in prerequisite. diff --git a/m4/gc-arcfour.m4 b/m4/gc-arcfour.m4 index 75a68b171..2defdc96f 100644 --- 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 0d1c3b01d..34a310c60 100644 --- 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: -- 2.11.0