Mercurial > hg > octave-lojdl > gnulib-hg
changeset 15270:d5aa06ef8fb9
crypto/gc-hmac-md5: Fix recent regression.
* modules/crypto/gc-hmac-md5 (Files): Remove m4/hmac-md5.m4.
(configure.ac): Invoke AC_LIBOBJ here.
* m4/gc-hmac-md5.m4 (gl_GC_HMAC_MD5): Don't invoke gl_HMAC_MD5.
Reported by Tom G. Christensen <tgc@jupiterrise.com>.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Fri, 17 Jun 2011 00:49:44 +0200 |
| parents | a86a7b1c29a0 |
| children | 34f981a7efc5 |
| files | ChangeLog m4/gc-hmac-md5.m4 modules/crypto/gc-hmac-md5 |
| diffstat | 3 files changed, 12 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2011-06-16 Bruno Haible <bruno@clisp.org> + crypto/gc-hmac-md5: Fix recent regression. + * modules/crypto/gc-hmac-md5 (Files): Remove m4/hmac-md5.m4. + (configure.ac): Invoke AC_LIBOBJ here. + * m4/gc-hmac-md5.m4 (gl_GC_HMAC_MD5): Don't invoke gl_HMAC_MD5. + Reported by Tom G. Christensen <tgc@jupiterrise.com>. + crypto/gc-des: Fix recent regression. * modules/crypto/gc-des (Files): Remove m4/des.m4. (configure.ac): Invoke AC_LIBOBJ here.
--- a/m4/gc-hmac-md5.m4 +++ b/m4/gc-hmac-md5.m4 @@ -1,4 +1,4 @@ -# gc-hmac-md5.m4 serial 2 +# gc-hmac-md5.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, @@ -9,7 +9,6 @@ AC_REQUIRE([gl_GC]) if test "$ac_cv_libgcrypt" != yes; then gl_MD5 - gl_HMAC_MD5 gl_MEMXOR fi ])
--- a/modules/crypto/gc-hmac-md5 +++ b/modules/crypto/gc-hmac-md5 @@ -8,7 +8,6 @@ m4/md5.m4 lib/hmac.h lib/hmac-md5.c -m4/hmac-md5.m4 lib/memxor.h lib/memxor.c m4/memxor.m4 @@ -19,6 +18,11 @@ configure.ac: gl_GC_HMAC_MD5 +if test "$ac_cv_libgcrypt" != yes; then + AC_LIBOBJ([md5]) + AC_LIBOBJ([hmac-md5]) + AC_LIBOBJ([memxor]) +fi gl_MODULE_INDICATOR([gc-hmac-md5]) Makefile.am: