fix compilation failure on 32/64bit linux systems, when libmysql is used

 with ext/mysql

diff --git a/NEWS b/NEWS
index 3d156c1788554f4c4a5c74ee05df094393cfbcf6..f9098179408cf7a1652a07bc2c8574eeaf07bb82 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -22,6 +22,9 @@ PHP                                                                        NEWS
     (reeze.xia@gmail.com)
   . Fixed bug #62500 (Segfault in DateInterval class when extended). (Laruence)
 
+- mysql:
+  . Fixed compilation failure on mixed 32/64 bit systems. (Andrey)
+
 - MySQLnd:
   . Fixed bug #62885 (mysqli_poll - Segmentation fault). (Laruence)
 

diff --git a/ext/mysql/config.m4 b/ext/mysql/config.m4
index 2babcee827dd0bf61baf1f4f25b9efe59a69c32e..e7d598fe05dedb4f8ca91d59cdab9a492961d902 100644 (file)
--- a/ext/mysql/config.m4
+++ b/ext/mysql/config.m4
@@ -98,6 +98,13 @@ Note that the MySQL client library is not bundled anymore!])
     MYSQL_LIB_CHK($i)
   done
 
+  if test -z "$MYSQL_LIB_DIR"; then
+    MYSQL_LIB_CHK(lib/x86_64-linux-gnu)
+  fi
+  if test -z "$MYSQL_LIB_DIR"; then
+    MYSQL_LIB_CHK(lib/i386-linux-gnu)
+  fi
+
   if test -z "$MYSQL_LIB_DIR"; then
     AC_MSG_ERROR([Cannot find lib$MYSQL_LIBNAME under $MYSQL_DIR.
 Note that the MySQL client library is not bundled anymore!])