upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-20 22:59:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup --with-tls handle

Browse source
This commit is contained in:
Kurt Zeilenga 2006-02-17 22:46:22 +00:00
parent c57eb180de
commit 7660018ef4
3 changed files with 43 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
build/openldap.m4
View file

@ -1439,12 +1439,11 @@ AC_DEFUN([OL_SASL_COMPAT],
dnl ==================================================================== dnl ====================================================================
dnl check for SSL compatibility dnl check for SSL compatibility
AC_DEFUN([OL_SSL_COMPAT], AC_DEFUN([OL_SSL_COMPAT],
[AC_CACHE_CHECK([OpenSSL library version (CRL checking capability)], [ol_cv_ssl_crl_compat],[ [AC_CACHE_CHECK([OpenSSL library version (CRL checking capability)],
[ol_cv_ssl_crl_compat],[
AC_EGREP_CPP(__ssl_compat,[ AC_EGREP_CPP(__ssl_compat,[
#ifdef HAVE_OPENSSL_SSL_H #ifdef HAVE_OPENSSL_SSL_H
#include <openssl/ssl.h> #include <openssl/ssl.h>
#else
#include <ssl.h>
#endif #endif
/* Require 0.9.7d+ */ /* Require 0.9.7d+ */

47
configure vendored
View file

@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.626 2006/02/10 07:21:09 kurt Exp . # From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.628 2006/02/13 01:24:33 lukeh Exp .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59. # Generated by GNU Autoconf 2.59.
# #
@ -5764,7 +5764,7 @@ ia64-*-hpux*)
;; ;;
*-*-irix6*) *-*-irix6*)
# Find out which ABI we are using. # Find out which ABI we are using.
echo '#line 5740 "configure"' > conftest.$ac_ext echo '#line 5767 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5 (eval $ac_compile) 2>&5
ac_status=$? ac_status=$?
@ -7744,11 +7744,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'` -e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:7720: $lt_compile\"" >&5) (eval echo "\"\$as_me:7747: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err) (eval "$lt_compile" 2>conftest.err)
ac_status=$? ac_status=$?
cat conftest.err >&5 cat conftest.err >&5
echo "$as_me:7724: \$? = $ac_status" >&5 echo "$as_me:7751: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized # The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output. # So say no if there are warnings other than the usual output.
@ -8006,11 +8006,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'` -e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:7982: $lt_compile\"" >&5) (eval echo "\"\$as_me:8009: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err) (eval "$lt_compile" 2>conftest.err)
ac_status=$? ac_status=$?
cat conftest.err >&5 cat conftest.err >&5
echo "$as_me:7986: \$? = $ac_status" >&5 echo "$as_me:8013: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized # The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output. # So say no if there are warnings other than the usual output.
@ -8068,11 +8068,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'` -e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:8044: $lt_compile\"" >&5) (eval echo "\"\$as_me:8071: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err) (eval "$lt_compile" 2>out/conftest.err)
ac_status=$? ac_status=$?
cat out/conftest.err >&5 cat out/conftest.err >&5
echo "$as_me:8048: \$? = $ac_status" >&5 echo "$as_me:8075: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext if (exit $ac_status) && test -s out/conftest2.$ac_objext
then then
# The compiler can only warn and ignore the option if not recognized # The compiler can only warn and ignore the option if not recognized
@ -10316,7 +10316,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 10292 "configure" #line 10319 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
@ -10414,7 +10414,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 10390 "configure" #line 10417 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
@ -19309,8 +19309,12 @@ echo "$as_me: error: Kerberos detection failed" >&2;}
fi fi
if test $ol_with_tls = yes ; then
ol_with_tls=auto
fi
ol_link_tls=no ol_link_tls=no
if test $ol_with_tls != no ; then if test $ol_with_tls = openssl || test $ol_with_tls = auto ; then
for ac_header in openssl/ssl.h for ac_header in openssl/ssl.h
do do
@ -19610,7 +19614,7 @@ fi
fi fi
if test $have_openssl = yes ; then if test $have_openssl = yes ; then
ol_with_tls=found ol_with_tls=openssl
ol_link_tls=yes ol_link_tls=yes
@ -19630,7 +19634,7 @@ _ACEOF
else else
TLS_LIBS="-lssl -lcrypto" TLS_LIBS="-lssl -lcrypto"
fi fi
fi
echo "$as_me:$LINENO: checking OpenSSL library version (CRL checking capability)" >&5 echo "$as_me:$LINENO: checking OpenSSL library version (CRL checking capability)" >&5
echo $ECHO_N "checking OpenSSL library version (CRL checking capability)... $ECHO_C" >&6 echo $ECHO_N "checking OpenSSL library version (CRL checking capability)... $ECHO_C" >&6
if test "${ol_cv_ssl_crl_compat+set}" = set; then if test "${ol_cv_ssl_crl_compat+set}" = set; then
@ -19646,8 +19650,6 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef HAVE_OPENSSL_SSL_H #ifdef HAVE_OPENSSL_SSL_H
#include <openssl/ssl.h> #include <openssl/ssl.h>
#else
#include <ssl.h>
#endif #endif
/* Require 0.9.7d+ */ /* Require 0.9.7d+ */
@ -19668,9 +19670,7 @@ fi
echo "$as_me:$LINENO: result: $ol_cv_ssl_crl_compat" >&5 echo "$as_me:$LINENO: result: $ol_cv_ssl_crl_compat" >&5
echo "${ECHO_T}$ol_cv_ssl_crl_compat" >&6 echo "${ECHO_T}$ol_cv_ssl_crl_compat" >&6
if test $ol_cv_ssl_crl_compat = no ; then if test $ol_cv_ssl_crl_compat = yes ; then
ol_link_ssl=no
else
cat >>confdefs.h <<\_ACEOF cat >>confdefs.h <<\_ACEOF
#define HAVE_OPENSSL_CRL 1 #define HAVE_OPENSSL_CRL 1
@ -19678,10 +19678,7 @@ _ACEOF
fi fi
fi fi
fi
else
{ echo "$as_me:$LINENO: WARNING: TLS data protection not supported!" >&5
echo "$as_me: WARNING: TLS data protection not supported!" >&2;}
fi fi
WITH_TLS=no WITH_TLS=no
@ -19692,17 +19689,18 @@ cat >>confdefs.h <<\_ACEOF
_ACEOF _ACEOF
WITH_TLS=yes WITH_TLS=yes
elif test $ol_with_tls = auto ; then elif test $ol_with_tls = auto ; then
{ echo "$as_me:$LINENO: WARNING: Could not locate TLS/SSL package" >&5 { echo "$as_me:$LINENO: WARNING: Could not locate TLS/SSL package" >&5
echo "$as_me: WARNING: Could not locate TLS/SSL package" >&2;} echo "$as_me: WARNING: Could not locate TLS/SSL package" >&2;}
{ echo "$as_me:$LINENO: WARNING: TLS data protection not supported!" >&5 { echo "$as_me:$LINENO: WARNING: TLS data protection not supported!" >&5
echo "$as_me: WARNING: TLS data protection not supported!" >&2;} echo "$as_me: WARNING: TLS data protection not supported!" >&2;}
elif test $ol_with_tls != no ; then elif test $ol_with_tls != no ; then
{ { echo "$as_me:$LINENO: error: Could not locate TLS/SSL package" >&5 { { echo "$as_me:$LINENO: error: Could not locate TLS/SSL package" >&5
echo "$as_me: error: Could not locate TLS/SSL package" >&2;} echo "$as_me: error: Could not locate TLS/SSL package" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
else
{ echo "$as_me:$LINENO: WARNING: TLS data protection not supported!" >&5
echo "$as_me: WARNING: TLS data protection not supported!" >&2;}
fi fi
if test $ol_enable_lmpasswd != no; then if test $ol_enable_lmpasswd != no; then
@ -45282,6 +45280,7 @@ fi
# Check whether --with-xxinstall or --without-xxinstall was given. # Check whether --with-xxinstall or --without-xxinstall was given.

22
configure.in
View file

@ -1324,8 +1324,12 @@ fi
dnl ---------------------------------------------------------------- dnl ----------------------------------------------------------------
dnl TLS/SSL dnl TLS/SSL
if test $ol_with_tls = yes ; then
ol_with_tls=auto
fi
ol_link_tls=no ol_link_tls=no
if test $ol_with_tls != no ; then if test $ol_with_tls = openssl || test $ol_with_tls = auto ; then
AC_CHECK_HEADERS(openssl/ssl.h) AC_CHECK_HEADERS(openssl/ssl.h)
if test $ac_cv_header_openssl_ssl_h = yes ; then if test $ac_cv_header_openssl_ssl_h = yes ; then
@ -1342,7 +1346,7 @@ if test $ol_with_tls != no ; then
fi fi
if test $have_openssl = yes ; then if test $have_openssl = yes ; then
ol_with_tls=found ol_with_tls=openssl
ol_link_tls=yes ol_link_tls=yes
AC_DEFINE(HAVE_OPENSSL, 1, AC_DEFINE(HAVE_OPENSSL, 1,
@ -1356,31 +1360,27 @@ if test $ol_with_tls != no ; then
else else
TLS_LIBS="-lssl -lcrypto" TLS_LIBS="-lssl -lcrypto"
fi fi
fi
OL_SSL_COMPAT OL_SSL_COMPAT
if test $ol_cv_ssl_crl_compat = no ; then if test $ol_cv_ssl_crl_compat = yes ; then
ol_link_ssl=no
else
AC_DEFINE(HAVE_OPENSSL_CRL, 1, AC_DEFINE(HAVE_OPENSSL_CRL, 1,
[define if you have OpenSSL with CRL checking capability]) [define if you have OpenSSL with CRL checking capability])
fi fi
fi fi
fi
else
AC_MSG_WARN([TLS data protection not supported!])
fi fi
WITH_TLS=no WITH_TLS=no
if test $ol_link_tls = yes ; then if test $ol_link_tls = yes ; then
AC_DEFINE(HAVE_TLS, 1, [define if you have TLS]) AC_DEFINE(HAVE_TLS, 1, [define if you have TLS])
WITH_TLS=yes WITH_TLS=yes
elif test $ol_with_tls = auto ; then elif test $ol_with_tls = auto ; then
AC_MSG_WARN([Could not locate TLS/SSL package]) AC_MSG_WARN([Could not locate TLS/SSL package])
AC_MSG_WARN([TLS data protection not supported!]) AC_MSG_WARN([TLS data protection not supported!])
elif test $ol_with_tls != no ; then elif test $ol_with_tls != no ; then
AC_MSG_ERROR([Could not locate TLS/SSL package]) AC_MSG_ERROR([Could not locate TLS/SSL package])
else
AC_MSG_WARN([TLS data protection not supported!])
fi fi
dnl ---------------------------------------------------------------- dnl ----------------------------------------------------------------