From: Andrey Hristov <andrey@php.net>
Date: Wed, 17 Oct 2012 15:22:31 +0000 (+0200)
Subject: fix compilation failure on 32/64bit linux systems, when libmysql is used
X-Git-Tag: php-5.3.19RC1~9^2~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c50d732f7686352381d44926988aca194204433d;p=php

fix compilation failure on 32/64bit linux systems, when libmysql is used
 with ext/mysql
---

diff --git a/NEWS b/NEWS
index 3d156c1788..f909817940 100644
--- 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 2babcee827..e7d598fe05 100644
--- 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!])