felipe Sat Oct 4 12:52:58 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pdo_dblib config.m4
Log:
- MFH: Fixed bug #44991 (Compile Failure With freetds0.82) (patch by matthias
at dsx dot at)
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_dblib/config.m4?r1=1.2.2.2.2.1.2.1&r2=1.2.2.2.2.1.2.2&diff_format=u
Index: php-src/ext/pdo_dblib/config.m4
diff -u php-src/ext/pdo_dblib/config.m4:1.2.2.2.2.1.2.1
php-src/ext/pdo_dblib/config.m4:1.2.2.2.2.1.2.2
--- php-src/ext/pdo_dblib/config.m4:1.2.2.2.2.1.2.1 Fri Jul 25 13:46:23 2008
+++ php-src/ext/pdo_dblib/config.m4 Sat Oct 4 12:52:58 2008
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.2.2.2.2.1.2.1 2008/07/25 13:46:23 jani Exp $
+dnl $Id: config.m4,v 1.2.2.2.2.1.2.2 2008/10/04 12:52:58 felipe Exp $
dnl
PHP_ARG_WITH(pdo-dblib, for PDO_DBLIB support via FreeTDS,
@@ -14,11 +14,11 @@
if test "$PHP_PDO_DBLIB" = "yes"; then
for i in /usr/local /usr; do
- if test -f $i/include/tds.h; then
+ if test -f $i/include/sybdb.h; then
PDO_FREETDS_INSTALLATION_DIR=$i
PDO_FREETDS_INCLUDE_DIR=$i/include
break
- elif test -f $i/include/freetds/tds.h; then
+ elif test -f $i/include/freetds/sybdb.h; then
PDO_FREETDS_INSTALLATION_DIR=$i
PDO_FREETDS_INCLUDE_DIR=$i/include/freetds
break;
@@ -31,10 +31,10 @@
elif test "$PHP_PDO_DBLIB" != "no"; then
- if test -f $PHP_PDO_DBLIB/include/tds.h; then
+ if test -f $PHP_PDO_DBLIB/include/sybdb.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
+ elif test -f $PHP_PDO_DBLIB/include/freetds/sybdb.h; then
PDO_FREETDS_INSTALLATION_DIR=$PHP_PDO_DBLIB
PDO_FREETDS_INCLUDE_DIR=$PHP_PDO_DBLIB/include/freetds
else
@@ -46,8 +46,8 @@
PHP_LIBDIR=lib
fi
- if test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.a" && test !
-r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.so"; then
- AC_MSG_ERROR(Could not find
$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.[a|so])
+ if test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a" && test
! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.so"; then
+ AC_MSG_ERROR(Could not find
$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.[a|so])
fi
PHP_ADD_INCLUDE($PDO_FREETDS_INCLUDE_DIR)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
