diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2013-12-10 21:37:30 -0800 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2013-12-10 21:37:30 -0800 |
commit | a8f9bc05c344ec9b9e0dee5499ce0b1427cbfea6 (patch) | |
tree | 41f158f310130e87e01a650a5e34e2c6d52d20d9 /m4 | |
parent | bb8097b96b074e55ff05dc379b394dbdbdc82f3e (diff) | |
download | emacs-a8f9bc05c344ec9b9e0dee5499ce0b1427cbfea6.tar.gz |
Remove the option of using libcrypto.
This scorches the earth and waits for spring;
see Ted Zlatanov and Stefan Monnier in
<http://lists.gnu.org/archive/html/emacs-devel/2013-12/msg00323.html>.
* configure.ac (with_openssl_default, HAVE_LIB_CRYPTO): Remove.
Do not say whether Emacs is configured to use a crypto library,
since it's no longer an option.
(gl_CRYPTO_CHECK): Define a dummy.
* lib/gl_openssl.h, m4/gl-openssl.m4: Remove.
* admin/merge-gnulib: Remove lib/gl_openssh.h and m4/gl-openssl.m4.
* src/Makefile.in (LIB_CRYPTO): Remove.
(LIBES): Don't use it.
Diffstat (limited to 'm4')
-rw-r--r-- | m4/gl-openssl.m4 | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/m4/gl-openssl.m4 b/m4/gl-openssl.m4 deleted file mode 100644 index 0434c4c8721..00000000000 --- a/m4/gl-openssl.m4 +++ /dev/null @@ -1,51 +0,0 @@ -# gl-openssl.m4 serial 3 -dnl Copyright (C) 2013 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -AC_DEFUN([gl_SET_CRYPTO_CHECK_DEFAULT], -[ - m4_define([gl_CRYPTO_CHECK_DEFAULT], [$1]) -]) -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: - 'yes', 'no', 'auto' => use if available, - 'optional' => use if available and warn if not available; - default is ']gl_CRYPTO_CHECK_DEFAULT['])], - [], - [with_openssl=$with_openssl_default]) - - if test "x$1" = xMD5; then - ALG_header=md5.h - else - ALG_header=sha.h - fi - - AC_SUBST([LIB_CRYPTO]) - if test "x$with_openssl" != xno; then - AC_CHECK_LIB([crypto], [$1], - [AC_CHECK_HEADERS([openssl/$ALG_header], - [LIB_CRYPTO=-lcrypto - AC_DEFINE([HAVE_OPENSSL_$1], [1], - [Define to 1 if libcrypto is used for $1.])])]) - if test "x$LIB_CRYPTO" = x; then - if test "x$with_openssl" = xyes; then - AC_MSG_ERROR([openssl development library not found for $1]) - elif test "x$with_openssl" = xoptional; then - AC_MSG_WARN([openssl development library not found for $1]) - fi - fi - fi -]) |