Mercurial > hg > octave-nkf > gnulib-hg
changeset 15272:d12c6feef598
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>.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Fri, 17 Jun 2011 00:56:44 +0200 |
| parents | 34f981a7efc5 |
| children | 8f6fd6b9cdd2 |
| files | ChangeLog m4/gc-rijndael.m4 modules/crypto/gc-rijndael |
| diffstat | 3 files changed, 11 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-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.
--- 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 @@ AC_DEFUN([gl_GC_RIJNDAEL], [ AC_REQUIRE([gl_GC]) - if test "$ac_cv_libgcrypt" != yes; then - gl_RIJNDAEL - fi ])
--- a/modules/crypto/gc-rijndael +++ b/modules/crypto/gc-rijndael @@ -7,7 +7,6 @@ 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 @@ 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: