MFH: Fixed bug #25703 (openssl checks failed)

diff --git a/NEWS b/NEWS
index 2c4c3777976f1263043bdcc539c195d6554a4b0b..76fc6273502a0b58e1276136b0a93b1575dfac1a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 PHP 4                                                                      NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? Oct 2003, Version 4.3.4RC2
+- Fixed bug #25703 (openssl checks failed). (Jani)
 - Fixed bug #25669 (eregi() with non-ascii characters). (Moriyoshi)
 
 29 Sep 2003, Version 4.3.4RC1

diff --git a/acinclude.m4 b/acinclude.m4
index bdc9c8fcfa72d66a62437327b5bf0e5cbe110102..d61667c3b0129d56a2cea46fab148d7bbdfda032 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1599,7 +1599,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
   fi
 
   dnl If pkg-config is found try using it
-  if test "$PHP_OPENSSL" = "yes" && test -x "$PKG_CONFIG"; then
+  if test "$PHP_OPENSSL" = "yes" && test -x "$PKG_CONFIG" && $PKG_CONFIG --exists openssl; then
     if $PKG_CONFIG --atleast-version=0.9.6 openssl; then
       found_openssl=yes
       OPENSSL_LIBS=`$PKG_CONFIG --libs openssl`