summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfoobar <sniper@php.net>2003-10-02 00:35:09 +0000
committerfoobar <sniper@php.net>2003-10-02 00:35:09 +0000
commit8ba1bcb252d638b347dc4a875cb07ed41a389078 (patch)
tree1d9f7c761d5226e7d598f23c27d0a59f42ee2745
parentb6380d5832470111f2d7bc1189163c51e502cd3d (diff)
downloadphp-git-8ba1bcb252d638b347dc4a875cb07ed41a389078.tar.gz
Should fix bug #25719
-rw-r--r--acinclude.m45
1 files changed, 3 insertions, 2 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index a276567f3b..6c0bdf8b54 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1617,6 +1617,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
if test -r $i/lib/libssl.a -o -r $i/lib/libssl.$SHLIB_SUFFIX_NAME; then
OPENSSL_LIBDIR=$i/lib
fi
+ test -n "$OPENSSL_INCDIR" && test -n "$OPENSSL_LIBDIR" && break
done
if test -z "$OPENSSL_INCDIR"; then
@@ -1645,12 +1646,12 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
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_LIBS="-L$OPENSSL_LIBDIR -lssl -lcrypto"
OPENSSL_INCS=-I$OPENSSL_INCDIR
], [
AC_MSG_ERROR([libssl not found!])
],[
- -L$OPENSSL_LIBDIR -lcrypto
+ -L$OPENSSL_LIBDIR -lssl -lcrypto
])
], [
AC_MSG_ERROR([libcrypto not found!])