* configure.ac: Disable libcrypto by default.

Merge from gnulib, incorporating:
2013-12-07 md5, sha1, sha256, sha512: fix link error with partial lib
* m4/gl-openssl.m4: Update from gnulib.

3 files changed, 12 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 9e47a2a4d07..0e5f084210f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2013-12-10  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * configure.ac: Disable libcrypto by default.
+
+        Merge from gnulib, incorporating:
+        2013-12-07 md5, sha1, sha256, sha512: fix link error with partial lib
+        * m4/gl-openssl.m4: Update from gnulib.
+
 2013-12-08  Eli Zaretskii  <eliz@gnu.org>
 
         * configure.ac (HAVE_RSVG) [mingw32]: Don't link against librsvg
diff --git a/configure.ac b/configure.ac
index 1f99a658cec..0a2e5c624e2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4697,7 +4697,6 @@ CFLAGS=$pre_PKG_CONFIG_CFLAGS
 LIBS="$LIB_PTHREAD $pre_PKG_CONFIG_LIBS"
 gl_ASSERT_NO_GNULIB_POSIXCHECK
 gl_ASSERT_NO_GNULIB_TESTS
-gl_SET_CRYPTO_CHECK_DEFAULT([auto])
 gl_INIT
 CFLAGS=$SAVE_CFLAGS
 LIBS=$SAVE_LIBS
diff --git a/m4/gl-openssl.m4 b/m4/gl-openssl.m4
index c8f9dd95e68..0434c4c8721 100644
--- a/m4/gl-openssl.m4
+++ b/m4/gl-openssl.m4
@@ -12,8 +12,12 @@ gl_SET_CRYPTO_CHECK_DEFAULT([no])
 
 AC_DEFUN([gl_CRYPTO_CHECK],
 [
+  dnl gnulib users set this before gl_INIT with gl_SET_CRYPTO_CHECK_DEFAULT()
   m4_divert_once([DEFAULTS], [with_openssl_default='gl_CRYPTO_CHECK_DEFAULT'])
 
+  dnl Only clear once, so crypto routines can be checked for individually
+  m4_divert_once([DEFAULTS], [LIB_CRYPTO=])
+
   AC_ARG_WITH([openssl],
     [AS_HELP_STRING([--with-openssl],
       [use libcrypto hash routines. Valid ARGs are:
@@ -29,7 +33,6 @@ AC_DEFUN([gl_CRYPTO_CHECK],
     ALG_header=sha.h
   fi
 
-  LIB_CRYPTO=
   AC_SUBST([LIB_CRYPTO])
   if test "x$with_openssl" != xno; then
     AC_CHECK_LIB([crypto], [$1],