Commit: c50d732f7686352381d44926988aca194204433d Author: Andrey Hristov <and...@php.net> Wed, 17 Oct 2012 17:22:31 +0200 Parents: e5bdd2c0eeab50dc1f863dae9a32d3857ece6a79 Branches: PHP-5.3
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c50d732f7686352381d44926988aca194204433d Log: fix compilation failure on 32/64bit linux systems, when libmysql is used with ext/mysql Changed paths: M NEWS M ext/mysql/config.m4 Diff: diff --git a/NEWS b/NEWS index 3d156c1..f909817 100644 --- a/NEWS +++ b/NEWS @@ -22,6 +22,9 @@ PHP NEWS (reeze....@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 2babcee..e7d598f 100644 --- a/ext/mysql/config.m4 +++ b/ext/mysql/config.m4 @@ -99,6 +99,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 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
