diff options
| -rw-r--r-- | configure.in | 31 |
1 files changed, 5 insertions, 26 deletions
diff --git a/configure.in b/configure.in index ee36ce3d1..69b4cb714 100644 --- a/configure.in +++ b/configure.in @@ -522,6 +522,7 @@ else AC_MSG_RESULT(no) fi + dnl ********************************************************************** dnl Check for the presence of SSL libraries and headers dnl ********************************************************************** @@ -540,7 +541,6 @@ then else dnl Check for & handle argument to --with-ssl. - AC_MSG_CHECKING(where to look for SSL) if test X"$OPT_SSL" = Xoff then @@ -577,35 +577,14 @@ else fi - dnl Check for SSLeay headers AC_CHECK_HEADERS(openssl/x509.h openssl/rsa.h openssl/crypto.h \ - openssl/pem.h openssl/ssl.h openssl/err.h) + openssl/pem.h openssl/ssl.h openssl/err.h, + OPENSSL_ENABLED=1) if test $ac_cv_header_openssl_x509_h = no; then - AC_CHECK_HEADERS(x509.h rsa.h crypto.h pem.h ssl.h err.h) - fi - - dnl - dnl If all heades are present, we have enabled SSL! - if test "$ac_cv_header_openssl_x509_h" = "yes" && - test "$ac_cv_header_openssl_rsa_h" = "yes" && - test "$ac_cv_header_openssl_crypto_h" = "yes" && - test "$ac_cv_header_openssl_pem_h" = "yes" && - test "$ac_cv_header_openssl_ssl_h" = "yes" && - test "$ac_cv_header_openssl_err_h" = "yes"; then - OPENSSL_ENABLED="1"; - fi - - dnl - dnl Check the alternative headers too - if test "$ac_cv_header_x509_h" = "yes" && - test "$ac_cv_header_rsa_h" = "yes" && - test "$ac_cv_header_crypto_h" = "yes" && - test "$ac_cv_header_pem_h" = "yes" && - test "$ac_cv_header_ssl_h" = "yes" && - test "$ac_cv_header_err_h" = "yes"; then - OPENSSL_ENABLED="1"; + AC_CHECK_HEADERS(x509.h rsa.h crypto.h pem.h ssl.h err.h, + OPENSSL_ENABLED=1) fi AC_SUBST(OPENSSL_ENABLED) |