[Emacs-diffs] trunk r115446: * configure.ac: Disable libcrypto by default.

[Paul Eggert]

------------------------------------------------------------
revno: 115446
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Mon 2013-12-09 18:44:28 -0800
message:
  * 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.
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  configure.ac                   
configure.in-20091113204419-o5vbwnq5f7feedwu-783
  m4/gl-openssl.m4               glopenssl.m4-20131208080521-d70mmask2amwsl1o-3

=== modified file 'ChangeLog'
--- a/ChangeLog 2013-12-08 19:28:29 +0000
+++ b/ChangeLog 2013-12-10 02:44:28 +0000
@@ -1,3 +1,11 @@
+2013-12-10  Paul Eggert  <address@hidden>
+
+       * 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  <address@hidden>
 
        * configure.ac (HAVE_RSVG) [mingw32]: Don't link against librsvg

=== modified file 'configure.ac'
--- a/configure.ac      2013-12-08 19:28:29 +0000
+++ b/configure.ac      2013-12-10 02:44:28 +0000
@@ -4697,7 +4697,6 @@
 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

=== modified file 'm4/gl-openssl.m4'
--- a/m4/gl-openssl.m4  2013-12-08 08:05:36 +0000
+++ b/m4/gl-openssl.m4  2013-12-10 02:44:28 +0000
@@ -12,8 +12,12 @@
 
 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 @@
     ALG_header=sha.h
   fi
 
-  LIB_CRYPTO=
   AC_SUBST([LIB_CRYPTO])
   if test "x$with_openssl" != xno; then
     AC_CHECK_LIB([crypto], [$1],