diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2013-12-09 18:44:28 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2013-12-09 18:44:28 -0800 |
| commit | 7d01e13ced50c4b17e762ac00b00fac497b944b1 (patch) | |
| tree | f26d22677606abf96facf6f8d5fb39df0dac39f6 /m4 | |
| parent | a71cfa02f3bba0caaf49c4fc49d46fa6eb077692 (diff) | |
| download | emacs-7d01e13ced50c4b17e762ac00b00fac497b944b1.tar.gz | |
* 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.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/gl-openssl.m4 | 5 |
1 files changed, 4 insertions, 1 deletions
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], |