com php-src: fix build with libmysql on Ubuntu 12.04 x64 probably other mixed 32/64 systems: ext/mysql/config.m4
| From: | Andrey Hristov | Date: | Wed, 17 Oct 2012 14:35:36 +0000 |
| Subject: | com php-src: fix build with libmysql on Ubuntu 12.04 x64 probably other mixed 32/64 systems: ext/mysql/config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-70406@lists.php.net to get a copy of this message | ||
Commit: d62702851ca7012cf4b635e6379cb4de383dc7ac
Author: Andrey Hristov <andrey@php.net> Wed, 17 Oct 2012 16:35:36 +0200
Parents: 54cbf5315c11172eeba9231d0f0f7f3174dee210
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d62702851ca7012cf4b635e6379cb4de383dc7ac
Log:
fix build with libmysql on Ubuntu 12.04 x64 probably other mixed 32/64 systems
Changed paths:
M ext/mysql/config.m4
Diff:
diff --git a/ext/mysql/config.m4 b/ext/mysql/config.m4
index fa7a46f..5968c43 100644
--- a/ext/mysql/config.m4
+++ b/ext/mysql/config.m4
@@ -97,6 +97,13 @@ Note that the MySQL client library is not bundled anymore!])
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!])
fi