sniper Wed Oct 1 20:35:32 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src acinclude.m4
Log:
MFH: fix for bug #25719
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.218.2.29 php-src/acinclude.m4:1.218.2.30
--- php-src/acinclude.m4:1.218.2.29 Tue Sep 30 14:08:57 2003
+++ php-src/acinclude.m4 Wed Oct 1 20:35:31 2003
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.218.2.29 2003/09/30 18:08:57 sniper Exp $
+dnl $Id: acinclude.m4,v 1.218.2.30 2003/10/02 00:35:31 sniper Exp $
dnl
dnl This file contains local autoconf functions.
@@ -1623,6 +1623,7 @@
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
@@ -1651,12 +1652,12 @@
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!])
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
