diff options
author | foobar <sniper@php.net> | 2003-09-24 14:24:18 +0000 |
---|---|---|
committer | foobar <sniper@php.net> | 2003-09-24 14:24:18 +0000 |
commit | 54a2a2ad2ead310fdf6f35e84ff5f8ef58d9c270 (patch) | |
tree | 0a276144390fa385fbf32e74f70272846d76dd7c /acinclude.m4 | |
parent | 4c31afd23bb4a0866f34d9d81681b43a4e5cc356 (diff) | |
download | php-git-54a2a2ad2ead310fdf6f35e84ff5f8ef58d9c270.tar.gz |
ws
Diffstat (limited to 'acinclude.m4')
-rw-r--r-- | acinclude.m4 | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index da3ab0c0a0..8513c3529b 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1605,58 +1605,58 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[ else - dnl If pkg-config fails for some reason, revert to the old method - if test "$PHP_OPENSSL" = "yes"; then - PHP_OPENSSL="/usr/local/ssl /usr/local /usr /usr/local/openssl" - fi - - for i in $PHP_OPENSSL; do - if test -r $i/include/openssl/evp.h; then - OPENSSL_INCDIR=$i/include - fi - if test -r $i/lib/libssl.a -o -r $i/lib/libssl.$SHLIB_SUFFIX_NAME; then - OPENSSL_LIBDIR=$i/lib + dnl If pkg-config fails for some reason, revert to the old method + if test "$PHP_OPENSSL" = "yes"; then + PHP_OPENSSL="/usr/local/ssl /usr/local /usr /usr/local/openssl" fi - done - if test -z "$OPENSSL_INCDIR"; then - AC_MSG_ERROR([Cannot find OpenSSL's <evp.h>]) - fi + for i in $PHP_OPENSSL; do + if test -r $i/include/openssl/evp.h; then + OPENSSL_INCDIR=$i/include + fi + if test -r $i/lib/libssl.a -o -r $i/lib/libssl.$SHLIB_SUFFIX_NAME; then + OPENSSL_LIBDIR=$i/lib + fi + done - if test -z "$OPENSSL_LIBDIR"; then - AC_MSG_ERROR([Cannot find OpenSSL's libraries]) - fi + if test -z "$OPENSSL_INCDIR"; then + AC_MSG_ERROR([Cannot find OpenSSL's <evp.h>]) + fi + + if test -z "$OPENSSL_LIBDIR"; then + AC_MSG_ERROR([Cannot find OpenSSL's libraries]) + fi - old_CPPFLAGS=$CPPFLAGS - CPPFLAGS=-I$OPENSSL_INCDIR - AC_MSG_CHECKING([for OpenSSL version]) - AC_EGREP_CPP(yes,[ + old_CPPFLAGS=$CPPFLAGS + CPPFLAGS=-I$OPENSSL_INCDIR + AC_MSG_CHECKING([for OpenSSL version]) + AC_EGREP_CPP(yes,[ #include <openssl/opensslv.h> #if OPENSSL_VERSION_NUMBER >= 0x0090600fL yes #endif - ],[ - AC_MSG_RESULT([>= 0.9.6]) - ],[ - AC_MSG_ERROR([OpenSSL version 0.9.6 or greater required.]) - ]) - CPPFLAGS=$old_CPPFLAGS + ],[ + AC_MSG_RESULT([>= 0.9.6]) + ],[ + AC_MSG_ERROR([OpenSSL version 0.9.6 or greater required.]) + ]) + CPPFLAGS=$old_CPPFLAGS - PHP_CHECK_LIBRARY(crypto, CRYPTO_free, [ - PHP_CHECK_LIBRARY(ssl, SSL_CTX_set_ssl_version, [ - found_openssl=yes - OPENSSL_LIBS=-L$OPENSSL_LIBDIR -lcrypto -lssl - OPENSSL_INCS=-I$OPENSSL_INCDIR + PHP_CHECK_LIBRARY(crypto, CRYPTO_free, [ + PHP_CHECK_LIBRARY(ssl, SSL_CTX_set_ssl_version, [ + found_openssl=yes + OPENSSL_LIBS=-L$OPENSSL_LIBDIR -lcrypto -lssl + OPENSSL_INCS=-I$OPENSSL_INCDIR + ], [ + AC_MSG_ERROR([libssl not found!]) + ],[ + -L$OPENSSL_LIBDIR -lcrypto + ]) ], [ - AC_MSG_ERROR([libssl not found!]) + AC_MSG_ERROR([libcrypto not found!]) ],[ - -L$OPENSSL_LIBDIR -lcrypto + -L$OPENSSL_LIBDIR ]) - ], [ - AC_MSG_ERROR([libcrypto not found!]) - ],[ - -L$OPENSSL_LIBDIR - ]) fi dnl For apache 1.3.x static build |