cvs: php-src /ext/pdo_mysql config.m4

sniper Mon Jun 13 19:37:21 2005 EDT Modified files: /php-src/ext/pdo_mysql config.m4 Log: ws http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/config.m4?r1=1.20&r2=1.21&ty=u Index: php-src/ext/pdo_mysql/config.m4 diff -u php-src/ext/pdo_mysql/config.m4:1.20 php-src/ext/pdo_mysql/config.m4:1.21 --- php-src/ext/pdo_mysql/config.m4:1.20 Sun May 29 19:16:43 2005 +++ php-src/ext/pdo_mysql/config.m4 Mon Jun 13 19:37:20 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.20 2005/05/29 23:16:43 sniper Exp $ +dnl $Id: config.m4,v 1.21 2005/06/13 23:37:20 sniper Exp $ dnl if test "$PHP_PDO" != "no"; then @@ -21,21 +21,21 @@ AC_DEFINE(HAVE_MYSQL, 1, [Whether you have MySQL]) for i in $PHP_PDO_MYSQL /usr/local /usr ; do - PDO_MYSQL_DIR=$i - PDO_MYSQL_CONFIG=$PDO_MYSQL_DIR/bin/mysql_config - if test -r $i/include/mysql; then - PDO_MYSQL_INC_DIR=$i/include/mysql - else - PDO_MYSQL_INC_DIR=$i/include - fi - if test -r $i/lib/mysql; then - PDO_MYSQL_LIB_DIR=$i/lib/mysql - else - PDO_MYSQL_LIB_DIR=$i/lib - fi - if test -x $PDO_MYSQL_CONFIG; then - break - fi + PDO_MYSQL_DIR=$i + PDO_MYSQL_CONFIG=$PDO_MYSQL_DIR/bin/mysql_config + if test -r $i/include/mysql; then + PDO_MYSQL_INC_DIR=$i/include/mysql + else + PDO_MYSQL_INC_DIR=$i/include + fi + if test -r $i/lib/mysql; then + PDO_MYSQL_LIB_DIR=$i/lib/mysql + else + PDO_MYSQL_LIB_DIR=$i/lib + fi + if test -x $PDO_MYSQL_CONFIG; then + break + fi done if test -z "$PDO_MYSQL_DIR"; then @@ -52,8 +52,8 @@ PHP_ADD_LIBRARY_WITH_PATH(mysqlclient, $PDO_MYSQL_LIB_DIR, PDO_MYSQL_SHARED_LIBADD) PHP_ADD_INCLUDE($PDO_MYSQL_INC_DIR) if test -x $PDO_MYSQL_CONFIG; then - PDO_MYSQL_LIBS=$PDO_MYSQL_CONFIG --libs - PHP_SUBST_OLD(PDO_MYSQL_LIBS) + PDO_MYSQL_LIBS=$PDO_MYSQL_CONFIG --libs + PHP_SUBST_OLD(PDO_MYSQL_LIBS) fi _SAVE_LDFLAGS=$LDFLAGS