cvs: php-src(PHP_5_2) /ext/interbase config.m4 /ext/odbc config.m4 /ext/pdo_firebird config.m4 /ext/pdo_mysql config.m4 /ext/pdo_pgsql config.m4
/ext/snmp config.m4

jani Tue Jul 31 13:02:01 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/interbase config.m4 /php-src/ext/odbc config.m4 /php-src/ext/pdo_firebird config.m4 /php-src/ext/pdo_mysql config.m4 /php-src/ext/pdo_pgsql config.m4 /php-src/ext/snmp config.m4 Log: MFH: Fix some lib vs $PHP_LIBDIR issues http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/config.m4?r1=1.20.6.1&r2=1.20.6.2&diff_format=u Index: php-src/ext/interbase/config.m4 diff -u php-src/ext/interbase/config.m4:1.20.6.1 php-src/ext/interbase/config.m4:1.20.6.2 --- php-src/ext/interbase/config.m4:1.20.6.1 Tue Jul 3 17:25:33 2007 +++ php-src/ext/interbase/config.m4 Tue Jul 31 13:02:00 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.20.6.1 2007/07/03 17:25:33 sniper Exp $ +dnl $Id: config.m4,v 1.20.6.2 2007/07/31 13:02:00 jani Exp $ dnl PHP_ARG_WITH(interbase,for InterBase support, @@ -12,7 +12,7 @@ IBASE_LIBDIR=/usr/interbase/lib else IBASE_INCDIR=$PHP_INTERBASE/include - IBASE_LIBDIR=$PHP_INTERBASE/lib + IBASE_LIBDIR=$PHP_INTERBASE/$PHP_LIBDIR fi PHP_CHECK_LIBRARY(fbclient, isc_detach_database, http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/config.m4?r1=1.78.2.2.2.3&r2=1.78.2.2.2.4&diff_format=u Index: php-src/ext/odbc/config.m4 diff -u php-src/ext/odbc/config.m4:1.78.2.2.2.3 php-src/ext/odbc/config.m4:1.78.2.2.2.4 --- php-src/ext/odbc/config.m4:1.78.2.2.2.3 Tue Jul 17 12:12:26 2007 +++ php-src/ext/odbc/config.m4 Tue Jul 31 13:02:00 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.78.2.2.2.3 2007/07/17 12:12:26 jani Exp $ +dnl $Id: config.m4,v 1.78.2.2.2.4 2007/07/31 13:02:00 jani Exp $ dnl AC_DEFUN([PHP_ODBC_CHECK_HEADER],[ @@ -136,7 +136,7 @@ PHP_SAPDB=/usr/local fi PHP_ADD_INCLUDE($PHP_SAPDB/incl) - PHP_ADD_LIBPATH($PHP_SAPDB/lib) + PHP_ADD_LIBPATH($PHP_SAPDB/$PHP_LIBDIR) PHP_ADD_LIBRARY(sqlod) ODBC_TYPE=sapdb AC_DEFINE(HAVE_SAPDB,1,[ ]) @@ -373,7 +373,7 @@ if test "$PHP_IODBC" = "yes"; then PHP_IODBC=/usr/local fi - PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/lib) + PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR) PHP_ADD_INCLUDE($PHP_IODBC/include, 1) ODBC_TYPE=iodbc ODBC_INCLUDE=-I$PHP_IODBC/include http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_firebird/config.m4?r1=1.8.4.1&r2=1.8.4.2&diff_format=u Index: php-src/ext/pdo_firebird/config.m4 diff -u php-src/ext/pdo_firebird/config.m4:1.8.4.1 php-src/ext/pdo_firebird/config.m4:1.8.4.2 --- php-src/ext/pdo_firebird/config.m4:1.8.4.1 Tue Jul 3 17:25:35 2007 +++ php-src/ext/pdo_firebird/config.m4 Tue Jul 31 13:02:00 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.8.4.1 2007/07/03 17:25:35 sniper Exp $ +dnl $Id: config.m4,v 1.8.4.2 2007/07/31 13:02:00 jani Exp $ dnl if test "$PHP_PDO" != "no"; then @@ -14,7 +14,7 @@ FIREBIRD_LIBDIR=/opt/firebird/lib else FIREBIRD_INCDIR=$PHP_PDO_FIREBIRD/include - FIREBIRD_LIBDIR=$PHP_PDO_FIREBIRD/lib + FIREBIRD_LIBDIR=$PHP_PDO_FIREBIRD/$PHP_LIBDIR fi PHP_CHECK_LIBRARY(fbclient, isc_detach_database, http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/config.m4?r1=1.25.2.7.2.5&r2=1.25.2.7.2.6&diff_format=u Index: php-src/ext/pdo_mysql/config.m4 diff -u php-src/ext/pdo_mysql/config.m4:1.25.2.7.2.5 php-src/ext/pdo_mysql/config.m4:1.25.2.7.2.6 --- php-src/ext/pdo_mysql/config.m4:1.25.2.7.2.5 Tue Jul 3 17:25:35 2007 +++ php-src/ext/pdo_mysql/config.m4 Tue Jul 31 13:02:00 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.25.2.7.2.5 2007/07/03 17:25:35 sniper Exp $ +dnl $Id: config.m4,v 1.25.2.7.2.6 2007/07/31 13:02:00 jani Exp $ dnl if test "$PHP_PDO" != "no"; then @@ -78,10 +78,10 @@ else PDO_MYSQL_INC_DIR=$PDO_MYSQL_DIR/include fi - if test -r $PDO_MYSQL_DIR/lib/mysql; then - PDO_MYSQL_LIB_DIR=$PDO_MYSQL_DIR/lib/mysql + if test -r $PDO_MYSQL_DIR/$PHP_LIBDIR/mysql; then + PDO_MYSQL_LIB_DIR=$PDO_MYSQL_DIR/$PHP_LIBDIR/mysql else - PDO_MYSQL_LIB_DIR=$PDO_MYSQL_DIR/lib + PDO_MYSQL_LIB_DIR=$PDO_MYSQL_DIR/$PHP_LIBDIR fi if test -r "$PDO_MYSQL_LIB_DIR"; then http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_pgsql/config.m4?r1=1.13.4.5&r2=1.13.4.6&diff_format=u Index: php-src/ext/pdo_pgsql/config.m4 diff -u php-src/ext/pdo_pgsql/config.m4:1.13.4.5 php-src/ext/pdo_pgsql/config.m4:1.13.4.6 --- php-src/ext/pdo_pgsql/config.m4:1.13.4.5 Wed Jul 11 21:51:55 2007 +++ php-src/ext/pdo_pgsql/config.m4 Tue Jul 31 13:02:00 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.13.4.5 2007/07/11 21:51:55 jani Exp $ +dnl $Id: config.m4,v 1.13.4.6 2007/07/31 13:02:00 jani Exp $ dnl if test "$PHP_PDO" != "no"; then @@ -43,7 +43,7 @@ fi done - for j in lib lib/pgsql lib/postgres lib/postgresql ""; do + for j in $PHP_LIBDIR $PHP_LIBDIR/pgsql $PHP_LIBDIR/postgres $PHP_LIBDIR/postgresql ""; do if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then PGSQL_LIBDIR=$i/$j fi http://cvs.php.net/viewvc.cgi/php-src/ext/snmp/config.m4?r1=1.32.2.1.2.2&r2=1.32.2.1.2.3&diff_format=u Index: php-src/ext/snmp/config.m4 diff -u php-src/ext/snmp/config.m4:1.32.2.1.2.2 php-src/ext/snmp/config.m4:1.32.2.1.2.3 --- php-src/ext/snmp/config.m4:1.32.2.1.2.2 Wed Jul 11 08:47:45 2007 +++ php-src/ext/snmp/config.m4 Tue Jul 31 13:02:00 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.32.2.1.2.2 2007/07/11 08:47:45 jani Exp $ +dnl $Id: config.m4,v 1.32.2.1.2.3 2007/07/31 13:02:00 jani Exp $ dnl PHP_ARG_WITH(snmp,for SNMP support, @@ -48,8 +48,8 @@ test -f $i/snmp/snmp.h && SNMP_INCDIR=$i/snmp test -f $i/snmp/include/ucd-snmp/snmp.h && SNMP_INCDIR=$i/snmp/include/ucd-snmp done - for i in /usr /usr/snmp /usr/local /usr/local/snmp; do - test -f $i/lib/libsnmp.a || test -f $i/lib/libsnmp.$SHLIB_SUFFIX_NAME && SNMP_LIBDIR=$i/lib + for i in /usr/$PHP_LIBDIR /usr/snmp/lib /usr/local/$PHP_LIBDIR /usr/local/lib /usr/local/snmp/lib; do + test -f $i/libsnmp.a || test -f $i/libsnmp.$SHLIB_SUFFIX_NAME && SNMP_LIBDIR=$i done else SNMP_INCDIR=$PHP_SNMP/include