MFH: fix for bug 29329

diff --git a/NEWS b/NEWS
index f68d40f6f75b55e5858b528ca8c1c5a9893be99d..6d622b39bfa06015c1151ac876f0950a7666e150 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -89,6 +89,7 @@ PHP                                                                        NEWS
 - Fixed bug #29767 (Weird behaviour of __set($name, $value)). (Dmitry)
 - Fixed bug #29733 (printf() handles repeated placeholders wrong).
   (bugs dot php dot net at bluetwanger dot de, Ilia)
+- Fixed bug #29329 (configure for mysqli with shared doesn't work). (Georg)
 - Fixed bug #29136 (make test - libtool failure on MacOSX). (Jani)
 - Fixed bug #28976 (mail(): use "From:" from headers if sendmail_from is empty).
   (Jani)

diff --git a/ext/mysqli/config.m4 b/ext/mysqli/config.m4
index 2cbd5a6680a1b0a98758640f8de68ddb2c3e3091..88c742a18f1dd8490614c216b6ee744cfbc0d34b 100644 (file)
--- a/ext/mysqli/config.m4
+++ b/ext/mysqli/config.m4
@@ -47,7 +47,7 @@ if test "$PHP_MYSQLI" != "no"; then
     PHP_CHECK_LIBRARY(mysqlclient, mysql_stmt_field_count,
     [ ],[
                AC_MSG_ERROR([MySQLI doesn't support versions < 4.1.3 (for MySQL 4.1.x) and < 5.0.1 for (MySQL 5.0.x) anymore. Please update your libraries.])
-       ],[])
+       ],[$MYSQLI_LIBLINE])
   ],[
     AC_MSG_ERROR([wrong mysql library version or lib not found. Check config.log for more information.])
   ],[