From: Bruno Haible Date: Thu, 16 Jun 2011 23:02:39 +0000 (+0200) Subject: crypto/gc-md4: Fix recent regression. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;ds=sidebyside;h=d6e1452c5a334098096bf2c8d6e272e38cba5202;p=pspp crypto/gc-md4: Fix recent regression. * modules/crypto/gc-md4 (configure.ac): Invoke AC_LIBOBJ here. * m4/md4.m4 (gl_MD4): Ensure the expansion is non-empty. --- diff --git a/ChangeLog b/ChangeLog index a51ddbae2e..23cb223077 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2011-06-16 Bruno Haible + crypto/gc-md4: Fix recent regression. + * modules/crypto/gc-md4 (configure.ac): Invoke AC_LIBOBJ here. + * m4/md4.m4 (gl_MD4): Ensure the expansion is non-empty. + crypto/gc-arctwo: Fix recent regression. * modules/crypto/gc-arctwo (configure.ac): Invoke AC_LIBOBJ here. * m4/arctwo.m4 (gl_ARCTWO): Ensure the expansion is non-empty. diff --git a/m4/md4.m4 b/m4/md4.m4 index 76e3a5cb94..5dde186b76 100644 --- a/m4/md4.m4 +++ b/m4/md4.m4 @@ -1,4 +1,4 @@ -# md4.m4 serial 5 +# md4.m4 serial 6 dnl Copyright (C) 2002-2006, 2008-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,4 +9,5 @@ AC_DEFUN([gl_MD4], [ AC_REQUIRE([gl_BIGENDIAN]) AC_REQUIRE([AC_C_INLINE]) + : ]) diff --git a/modules/crypto/gc-md4 b/modules/crypto/gc-md4 index 1e9490bf4f..cdc600590b 100644 --- a/modules/crypto/gc-md4 +++ b/modules/crypto/gc-md4 @@ -13,6 +13,9 @@ crypto/gc configure.ac: gl_GC_MD4 +if test "$ac_cv_libgcrypt" != yes; then + AC_LIBOBJ([md4]) +fi gl_MODULE_INDICATOR([gc-md4]) Makefile.am: