Permalink
Browse files

Fix --with-sslinc --with-sslib for openssl 1.0. Fixes #504

Found by: cpg
Patch by: michaelortmann
Fixes: #504
  • Loading branch information...
michaelortmann authored and vanosg committed Sep 9, 2018
1 parent 81f37a3 commit b4cb7130278f7ff66da6405dc10bff260602a8eb
Showing with 3 additions and 2 deletions.
  1. +3 −2 aclocal.m4
View
@@ -1615,12 +1615,13 @@ AC_DEFUN(EGG_TLS_WITHSSL,
[
if test "$enable_tls" != "no"; then
if test -d "$withval"; then
AC_CHECK_LIB(ssl, SSL_accept, , [havessllib="no"], [-L$withval -lcrypto])
AC_CHECK_LIB(crypto, X509_digest, , [havessllib="no"], [-L$withval -lssl])
AC_CHECK_LIB(ssl, SSL_accept, , [havessllib="no"], [-L$withval -lcrypto])
if test "$havessllib" = "no"; then
AC_MSG_WARN([Invalid path to OpenSSL libs. $withval doesn't contain the required files.])
else
AC_SUBST(SSL_LIBS, [-L$withval])
LDFLAGS="${LDFLAGS} -L$withval"
fi
else
AC_MSG_WARN([You have specified an invalid path to OpenSSL libs. $withval is not a directory.])
@@ -1646,8 +1647,8 @@ AC_DEFUN([EGG_TLS_DETECT],
])
fi
if test -z "$SSL_LIBS"; then
AC_CHECK_LIB(ssl, SSL_accept, , [havessllib="no"], [-lcrypto])
AC_CHECK_LIB(crypto, X509_digest, , [havessllib="no"], [-lssl])
AC_CHECK_LIB(ssl, SSL_accept, , [havessllib="no"], [-lcrypto])
AC_CHECK_FUNCS([EVP_md5 EVP_sha1 a2i_IPADDRESS], , [[
havessllib="no"
break

0 comments on commit b4cb713

Please sign in to comment.