wez Tue Nov 1 08:12:52 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/pdo_dblib config.m4
Log:
Fix #35032; pdo_dblib doesn't find includes on some systems
http://cvs.php.net/diff.php/php-src/ext/pdo_dblib/config.m4?r1=1.2.2.1&r2=1.2.2.2&ty=u
Index: php-src/ext/pdo_dblib/config.m4
diff -u php-src/ext/pdo_dblib/config.m4:1.2.2.1
php-src/ext/pdo_dblib/config.m4:1.2.2.2
--- php-src/ext/pdo_dblib/config.m4:1.2.2.1 Sat Sep 24 19:23:24 2005
+++ php-src/ext/pdo_dblib/config.m4 Tue Nov 1 08:12:52 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.2.2.1 2005/09/24 23:23:24 sniper Exp $
+dnl $Id: config.m4,v 1.2.2.2 2005/11/01 13:12:52 wez Exp $
dnl
if test "$PHP_PDO" != "no"; then
@@ -10,13 +10,17 @@
if test "$PHP_PDO_DBLIB" != "no"; then
- PDO_FREETDS_INSTALLATION_DIR=""
if test "$PHP_PDO_DBLIB" = "yes"; then
for i in /usr/local /usr; do
if test -f $i/include/tds.h; then
PDO_FREETDS_INSTALLATION_DIR=$i
+ PDO_FREETDS_INCLUDE_DIR=$i/include
break
+ elif test -f $i/include/freetds/tds.h; then
+ PDO_FREETDS_INSTALLATION_DIR=$i
+ PDO_FREETDS_INCLUDE_DIR=$i/include/freetds
+ break;
fi
done
@@ -28,6 +32,10 @@
if test -f $PHP_PDO_DBLIB/include/tds.h; then
PDO_FREETDS_INSTALLATION_DIR=$PHP_PDO_DBLIB
+ PDO_FREETDS_INCLUDE_DIR=$PHP_PDO_DBLIB/include
+ elif test -f $PHP_PDO_DBLIB/include/freetds/tds.h; then
+ PDO_FREETDS_INSTALLATION_DIR=$PHP_PDO_DBLIB
+ PDO_FREETDS_INCLUDE_DIR=$PHP_PDO_DBLIB/include/freetds
else
AC_MSG_ERROR(Directory $PHP_PDO_DBLIB is not a FreeTDS installation
directory)
fi
@@ -41,11 +49,9 @@
AC_MSG_ERROR(Could not find
$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.[a|so])
fi
- PDO_DBLIB_INCDIR=$PDO_FREETDS_INSTALLATION_DIR/include
- PDO_DBLIB_LIBDIR=$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR
+ PHP_ADD_INCLUDE($PDO_FREETDS_INCLUDE_DIR)
+ PHP_ADD_LIBRARY_WITH_PATH(sybdb, $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR,
PDO_DBLIB_SHARED_LIBADD)
- PHP_ADD_INCLUDE($PDO_DBLIB_INCDIR)
- PHP_ADD_LIBRARY_WITH_PATH(sybdb, $PDO_DBLIB_LIBDIR, PDO_DBLIB_SHARED_LIBADD)
ifdef([PHP_CHECK_PDO_INCLUDES],
[
PHP_CHECK_PDO_INCLUDES
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
