Commit cbb5553b authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

Newer versions of OpenSSL install headers in $prefix/include/openssl...

parent 509fdc1e
......@@ -4731,7 +4731,7 @@ fi
ol_link_tls=no
if test $ol_with_tls != no ; then
for ac_hdr in ssl.h
for ac_hdr in openssl/ssl.h ssl.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
......@@ -4772,7 +4772,7 @@ fi
done
if test $ac_cv_header_ssl_h = yes ; then
if test $ac_cv_header_openssl_ssl_h = yes -o $ac_cv_header_ssl_h = yes ; then
echo $ac_n "checking for SSLeay_add_ssl_algorithms in -lssl""... $ac_c" 1>&6
echo "configure:4778: checking for SSLeay_add_ssl_algorithms in -lssl" >&5
ac_lib_var=`echo ssl'_'SSLeay_add_ssl_algorithms | sed 'y%./+-%__p_%'`
......
......@@ -678,9 +678,9 @@ dnl
ol_link_tls=no
if test $ol_with_tls != no ; then
AC_CHECK_HEADERS(ssl.h)
AC_CHECK_HEADERS(openssl/ssl.h ssl.h)
if test $ac_cv_header_ssl_h = yes ; then
if test $ac_cv_header_openssl_ssl_h = yes -o $ac_cv_header_ssl_h = yes ; then
AC_CHECK_LIB(ssl, SSLeay_add_ssl_algorithms,
[have_ssleay=yes
need_rsaref=no],
......
......@@ -527,6 +527,9 @@
/* Define if you have the <ndir.h> header file. */
#undef HAVE_NDIR_H
/* Define if you have the <openssl/ssl.h> header file. */
#undef HAVE_OPENSSL_SSL_H
/* Define if you have the <psap.h> header file. */
#undef HAVE_PSAP_H
......
......@@ -24,7 +24,9 @@
#include <ldap_pvt_thread.h>
#endif
#ifdef HAVE_SSL_H
#ifdef HAVE_OPENSSL_SSL_H
#include <openssl/ssl.h>
#elif defined( HAVE_SSL_H )
#include <ssl.h>
#endif
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment