MFH: Fixed bug #26461 (-lssl missing from LIBS)

diff --git a/NEWS b/NEWS
index e0c05d33e8b094bc11dd0e1b335a30ee170d511c..0bcbc88a802646877a978eb4aeb1ec6ff8f80668 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,7 @@ PHP 4                                                                      NEWS
   passed by reference). (Wez)
 - Fixed bug #26463 (Incorrect handling of semicolons after heredoc). (Ilia)
 - Fixed bug #26462 (phpize + ext/bcmath -> compile error). (Jani)
+- Fixed bug #26461 (-lssl missing from LIBS). (Jani)
 - Fixed bug #26458 (var_dump(), var_export(), debug_zval_dump() not binary
   safe for array keys). (Ilia)
 - Fixed bug #26447 (--with-openssl=shared causes compile errors). (Jani)

diff --git a/acinclude.m4 b/acinclude.m4
index d80928a3481eb29dbd8044e88e435cbdd7b846ac..284c257e0f16999337aa19e2ddac5d29f0643a2c 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1669,7 +1669,6 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
     old_LIBS=$LIBS
     LIBS="$LIBS -lcrypto"
     PHP_CHECK_LIBRARY(ssl, SSL_CTX_set_ssl_version, [
-      PHP_ADD_LIBRARY(ssl,,$1)
       found_openssl=yes
     ],[
       AC_MSG_ERROR([libssl not found!])
@@ -1677,6 +1676,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
       -L$OPENSSL_LIBDIR
     ])
     LIBS=$old_LIBS
+    PHP_ADD_LIBRARY(ssl,,$1)
   fi
 
   dnl For apache 1.3.x static build