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 /admin/merge-gnulib | |
| parent | bb8097b96b074e55ff05dc379b394dbdbdc82f3e (diff) | |
| download | emacs-a8f9bc05c344ec9b9e0dee5499ce0b1427cbfea6.tar.gz emacs-a8f9bc05c344ec9b9e0dee5499ce0b1427cbfea6.tar.bz2 emacs-a8f9bc05c344ec9b9e0dee5499ce0b1427cbfea6.zip | |
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 'admin/merge-gnulib')
| -rwxr-xr-x | admin/merge-gnulib | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/admin/merge-gnulib b/admin/merge-gnulib index a5bd622f4c0..af9300edbec 100755 --- a/admin/merge-gnulib +++ b/admin/merge-gnulib @@ -91,7 +91,8 @@ test -x "$gnulib_srcdir"/gnulib-tool || { } "$gnulib_srcdir"/gnulib-tool --dir="$src" $GNULIB_TOOL_FLAGS $GNULIB_MODULES && -rm -- "$src"m4/fcntl-o.m4 "$src"m4/gnulib-cache.m4 "$src"m4/warn-on-use.m4 && +rm -- "$src"lib/gl_openssl.h "$src"m4/fcntl-o.m4 "$src"m4/gl-openssl.m4 \ + "$src"m4/gnulib-cache.m4"$src" m4/warn-on-use.m4 && cp -- "$gnulib_srcdir"/build-aux/texinfo.tex "$src"doc/misc && cp -- "$gnulib_srcdir"/build-aux/move-if-change "$src"build-aux && autoreconf -i -I m4 -- ${src:+"$src"} |