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

diff --git a/configure b/configure
index 9ebc1ace961ed310f331499abf2c215d5849dc6d..1d189f68c1193df006197c4ee118d34fac34ec22 100755 (executable)
--- a/configure
+++ b/configure
@@ -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_%'`

diff --git a/configure.in b/configure.in
index ff3595598871f2aebc02e60a39560d5c9d461084..8dc2ec13cb642c2668ad3f50518043dd6b6c5483 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -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],

diff --git a/include/portable.h.in b/include/portable.h.in
index eca970040a400ca49b542819c1bb550470f0b4b4..c874d9b237c1ce8e0cfdc31c4c66a2e1df6be6d4 100644 (file)
--- a/include/portable.h.in
+++ b/include/portable.h.in
@@ -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
 

diff --git a/libraries/libldap/tls.c b/libraries/libldap/tls.c
index 81b08e69a7b7abb94c66c73dd0b2d6841f980ac1..36ad1257bdd220c5372b337bc5a0ae6b5d4882cb 100644 (file)
--- a/libraries/libldap/tls.c
+++ b/libraries/libldap/tls.c
@@ -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