# HG changeset patch # User Bruno Haible # Date 1308265618 -7200 # Node ID a223b1671bad5dfaa5785f68e7d0956040995f21 # Parent 82301ffbf6b96807c1d6b3f3bc516b21ddc8a747 crypto/gc-sha1: Fix recent regression. * modules/crypto/gc-sha1 (configure.ac): Invoke AC_LIBOBJ here. * m4/gc-sha1.m4 (gl_GC_SHA1): Don't invoke gl_SHA1. diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2011-06-16 Bruno Haible + crypto/gc-sha1: Fix recent regression. + * modules/crypto/gc-sha1 (configure.ac): Invoke AC_LIBOBJ here. + * m4/gc-sha1.m4 (gl_GC_SHA1): Don't invoke gl_SHA1. + crypto/gc-md5: Fix recent regression. * modules/crypto/gc-md5 (configure.ac): Invoke AC_LIBOBJ here. diff --git a/m4/gc-sha1.m4 b/m4/gc-sha1.m4 --- a/m4/gc-sha1.m4 +++ b/m4/gc-sha1.m4 @@ -1,4 +1,4 @@ -# gc-sha1.m4 serial 2 +# gc-sha1.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_SHA1], [ AC_REQUIRE([gl_GC]) - if test "$ac_cv_libgcrypt" != yes; then - gl_SHA1 - fi ]) diff --git a/modules/crypto/gc-sha1 b/modules/crypto/gc-sha1 --- a/modules/crypto/gc-sha1 +++ b/modules/crypto/gc-sha1 @@ -13,6 +13,9 @@ configure.ac: gl_GC_SHA1 +if test "$ac_cv_libgcrypt" != yes; then + AC_LIBOBJ([sha1]) +fi gl_MODULE_INDICATOR([gc-sha1]) Makefile.am: