jani Tue Jul 31 13:01:42 2007 UTC Modified files: /php-src/ext/interbase config.m4 /php-src/ext/odbc config.m4 /php-src/ext/pdo_firebird config.m4 /php-src/ext/pdo_pgsql config.m4 /php-src/ext/snmp config.m4 Log: - Fix some lib vs. $PHP_LIBDIR issues. http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/config.m4?r1=1.21&r2=1.22&diff_format=u Index: php-src/ext/interbase/config.m4 diff -u php-src/ext/interbase/config.m4:1.21 php-src/ext/interbase/config.m4:1.22 --- php-src/ext/interbase/config.m4:1.21 Tue Jul 3 17:24:36 2007 +++ php-src/ext/interbase/config.m4 Tue Jul 31 13:01:42 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.21 2007/07/03 17:24:36 sniper Exp $ +dnl $Id: config.m4,v 1.22 2007/07/31 13:01:42 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.82&r2=1.83&diff_format=u Index: php-src/ext/odbc/config.m4 diff -u php-src/ext/odbc/config.m4:1.82 php-src/ext/odbc/config.m4:1.83 --- php-src/ext/odbc/config.m4:1.82 Tue Jul 17 12:11:41 2007 +++ php-src/ext/odbc/config.m4 Tue Jul 31 13:01:42 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.82 2007/07/17 12:11:41 jani Exp $ +dnl $Id: config.m4,v 1.83 2007/07/31 13:01:42 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.9&r2=1.10&diff_format=u Index: php-src/ext/pdo_firebird/config.m4 diff -u php-src/ext/pdo_firebird/config.m4:1.9 php-src/ext/pdo_firebird/config.m4:1.10 --- php-src/ext/pdo_firebird/config.m4:1.9 Tue Jul 3 17:24:37 2007 +++ php-src/ext/pdo_firebird/config.m4 Tue Jul 31 13:01:42 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.9 2007/07/03 17:24:37 sniper Exp $ +dnl $Id: config.m4,v 1.10 2007/07/31 13:01:42 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_pgsql/config.m4?r1=1.18&r2=1.19&diff_format=u Index: php-src/ext/pdo_pgsql/config.m4 diff -u php-src/ext/pdo_pgsql/config.m4:1.18 php-src/ext/pdo_pgsql/config.m4:1.19 --- php-src/ext/pdo_pgsql/config.m4:1.18 Wed Jul 11 21:51:10 2007 +++ php-src/ext/pdo_pgsql/config.m4 Tue Jul 31 13:01:42 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.18 2007/07/11 21:51:10 jani Exp $ +dnl $Id: config.m4,v 1.19 2007/07/31 13:01:42 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.35&r2=1.36&diff_format=u Index: php-src/ext/snmp/config.m4 diff -u php-src/ext/snmp/config.m4:1.35 php-src/ext/snmp/config.m4:1.36 --- php-src/ext/snmp/config.m4:1.35 Wed Jul 11 08:47:31 2007 +++ php-src/ext/snmp/config.m4 Tue Jul 31 13:01:42 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.35 2007/07/11 08:47:31 jani Exp $ +dnl $Id: config.m4,v 1.36 2007/07/31 13:01:42 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
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php