procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* configure.ac: Disable libcrypto by default.

Browse source 
Merge from gnulib, incorporating:
2013-12-07 md5, sha1, sha256, sha512: fix link error with partial lib
* m4/gl-openssl.m4: Update from gnulib.
This commit is contained in:
Paul Eggert 2013-12-09 18:44:28 -08:00
parent a71cfa02f3
commit 7d01e13ced
3 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2013-12-10 Paul Eggert <eggert@cs.ucla.edu>
* 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 <eliz@gnu.org>
* configure.ac (HAVE_RSVG) [mingw32]: Don't link against librsvg

1
configure.ac
View file

@ -4697,7 +4697,6 @@ CFLAGS=$pre_PKG_CONFIG_CFLAGS
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

5
m4/gl-openssl.m4
View file

@ -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],