From: Kurt Zeilenga <kurt@openldap.org>
Date: Wed, 14 Jul 1999 00:03:52 +0000 (+0000)
Subject: Newer versions of OpenSSL install headers in $prefix/include/openssl...
X-Git-Tag: OPENLDAP_REL_ENG_2_BP~142
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=cbb5553b039168761047e56c7d0ad100b5f3cf50;p=openldap

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

diff --git a/configure b/configure
index 9ebc1ace96..1d189f68c1 100755
--- 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 ff35955988..8dc2ec13cb 100644
--- 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 eca970040a..c874d9b237 100644
--- 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 81b08e69a7..36ad1257bd 100644
--- 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