diff options
| author | Andrey Hristov <andrey@php.net> | 2012-10-17 17:22:31 +0200 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2012-10-17 17:22:31 +0200 |
| commit | c50d732f7686352381d44926988aca194204433d (patch) | |
| tree | 23f9e6d218eba386f305dcb9a922842d73e049e1 | |
| parent | e5bdd2c0eeab50dc1f863dae9a32d3857ece6a79 (diff) | |
| download | php-git-c50d732f7686352381d44926988aca194204433d.tar.gz | |
fix compilation failure on 32/64bit linux systems, when libmysql is used
with ext/mysql
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/mysql/config.m4 | 7 |
2 files changed, 10 insertions, 0 deletions
@@ -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 @@ -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 |