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 /src | |
| 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 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/Makefile.in | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index a263867d617..58495874b2b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2013-12-11 Paul Eggert <eggert@cs.ucla.edu> + + Remove the option of using libcrypto. + * Makefile.in (LIB_CRYPTO): Remove. + (LIBES): Don't use it. + 2013-12-11 Juri Linkov <juri@jurta.org> * term.c (term_get_fkeys_1): Remove non-standard IBM terminfo diff --git a/src/Makefile.in b/src/Makefile.in index cef1ba5ed2e..7d91928acfe 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -139,7 +139,6 @@ M17N_FLT_LIBS = @M17N_FLT_LIBS@ LIB_ACL=@LIB_ACL@ LIB_CLOCK_GETTIME=@LIB_CLOCK_GETTIME@ -LIB_CRYPTO=@LIB_CRYPTO@ LIB_EACCESS=@LIB_EACCESS@ LIB_FDATASYNC=@LIB_FDATASYNC@ LIB_TIMER_TIME=@LIB_TIMER_TIME@ @@ -404,7 +403,6 @@ ALLOBJS = $(FIRSTFILE_OBJ) $(VMLIMIT_OBJ) $(obj) $(otherobj) LIBES = $(LIBS) $(W32_LIBS) $(LIBS_GNUSTEP) $(LIBX_BASE) $(LIBIMAGE) \ $(LIBX_OTHER) $(LIBSOUND) \ $(RSVG_LIBS) $(IMAGEMAGICK_LIBS) $(LIB_ACL) $(LIB_CLOCK_GETTIME) \ - $(LIB_CRYPTO) \ $(LIB_EACCESS) $(LIB_FDATASYNC) $(LIB_TIMER_TIME) $(DBUS_LIBS) \ $(LIB_EXECINFO) $(XRANDR_LIBS) $(XINERAMA_LIBS) \ $(LIBXML2_LIBS) $(LIBGPM) $(LIBRESOLV) $(LIBS_SYSTEM) \ |