Mercurial > hg > octave-jordi > gnulib-hg
changeset 15268:a36b75afc610
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 <tgc@jupiterrise.com>.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Fri, 17 Jun 2011 00:44:56 +0200 |
| parents | b6beea3e3300 |
| children | a86a7b1c29a0 |
| files | ChangeLog m4/gc-arcfour.m4 modules/crypto/gc-arcfour |
| diffstat | 3 files changed, 12 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2011-06-16 Bruno Haible <bruno@clisp.org> + + 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 <tgc@jupiterrise.com>. + 2011-06-16 Paul Eggert <eggert@cs.ucla.edu> * m4/lstat.m4 (gl_FUNC_LSTAT): Fix typo in prerequisite.
--- 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 @@ AC_DEFUN([gl_GC_ARCFOUR], [ AC_REQUIRE([gl_GC]) - if test "$ac_cv_libgcrypt" != yes; then - gl_ARCFOUR - fi ])
--- a/modules/crypto/gc-arcfour +++ b/modules/crypto/gc-arcfour @@ -5,7 +5,6 @@ m4/gc-arcfour.m4 lib/arcfour.h lib/arcfour.c -m4/arcfour.m4 Depends-on: stdint @@ -13,6 +12,9 @@ configure.ac: gl_GC_ARCFOUR +if test "$ac_cv_libgcrypt" != yes; then + AC_LIBOBJ([arcfour]) +fi gl_MODULE_INDICATOR([gc-arcfour]) Makefile.am: