diff options
| author | Joe Orton <jorton@php.net> | 2004-11-03 14:32:52 +0000 |
|---|---|---|
| committer | Joe Orton <jorton@php.net> | 2004-11-03 14:32:52 +0000 |
| commit | 2685ca935fceb0dbb4cb61161c93444cec7eef2c (patch) | |
| tree | d8a3df250ee349710abf8ff900af5226b6d05c9f /ext/mysql/config.m4 | |
| parent | 557cda47a06bd879835d864c1874671b35f82093 (diff) | |
| download | php-git-2685ca935fceb0dbb4cb61161c93444cec7eef2c.tar.gz | |
Update extensions to use /path/to/$PHP_LIBDIR rather than /path/to/lib
to support multi-ABI platforms.
Diffstat (limited to 'ext/mysql/config.m4')
| -rw-r--r-- | ext/mysql/config.m4 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/mysql/config.m4 b/ext/mysql/config.m4 index 8bf0a6a879..c45c8d4776 100644 --- a/ext/mysql/config.m4 +++ b/ext/mysql/config.m4 @@ -83,7 +83,7 @@ if test "$PHP_MYSQL" != "no"; then Note that the MySQL client library is not bundled anymore.]) fi - for i in lib lib/mysql; do + for i in $PHP_LIBDIR $PHP_LIBDIR/mysql; do MYSQL_LIB_CHK($i) done @@ -99,9 +99,9 @@ Note that the MySQL client library is not bundled anymore.]) PHP_CHECK_LIBRARY(mysqlclient, mysql_error, [], [ AC_MSG_ERROR([mysql configure failed. Please check config.log for more information.]) ], [ - -L$PHP_ZLIB_DIR/lib -L$MYSQL_LIB_DIR + -L$PHP_ZLIB_DIR/$PHP_LIBDIR -L$MYSQL_LIB_DIR ]) - MYSQL_LIBS="-L$PHP_ZLIB_DIR/lib -lz" + MYSQL_LIBS="-L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz" else PHP_ADD_LIBRARY(z,, MYSQL_SHARED_LIBADD) PHP_CHECK_LIBRARY(mysqlclient, mysql_errno, [], [ |