felipe Sat Oct 4 13:19:22 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS
/php-src/ext/mssql config.m4
/php-src/ext/pdo_dblib config.m4
Log:
MFH:
- Fixed bug #44991 (Compile Failure With freetds0.82)
patch by:
- jklowden at freetds dot org (ext/mssql)
- matthias at dsx dot at (ext/pdo_dblib)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1239&r2=1.2027.2.547.2.1240&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1239 php-src/NEWS:1.2027.2.547.2.1240
--- php-src/NEWS:1.2027.2.547.2.1239 Fri Oct 3 14:52:52 2008
+++ php-src/NEWS Sat Oct 4 13:19:21 2008
@@ -99,6 +99,8 @@
and hash()). (Tony)
- Fixed bug #45004 (pg_insert() does not accept 4 digit timezone format).
(Ilia)
+- Fixed bug #44991 (Compile Failure With freetds0.82).
+ (jklowden at freetds dot org, matthias at dsx dot at)
- Fixed bug #44925 (preg_grep() modifies input array). (Nuno)
- Fixed bug #44891 Memory leak using registerPHPFunctions and XSLT Variable
as function parameter. (Rob)
http://cvs.php.net/viewvc.cgi/php-src/ext/mssql/config.m4?r1=1.9.2.2.2.1&r2=1.9.2.2.2.2&diff_format=u
Index: php-src/ext/mssql/config.m4
diff -u php-src/ext/mssql/config.m4:1.9.2.2.2.1
php-src/ext/mssql/config.m4:1.9.2.2.2.2
--- php-src/ext/mssql/config.m4:1.9.2.2.2.1 Tue Jul 3 17:25:34 2007
+++ php-src/ext/mssql/config.m4 Sat Oct 4 13:19:22 2008
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.9.2.2.2.1 2007/07/03 17:25:34 sniper Exp $
+dnl $Id: config.m4,v 1.9.2.2.2.2 2008/10/04 13:19:22 felipe Exp $
dnl
PHP_ARG_WITH(mssql,for MSSQL support via FreeTDS,
@@ -10,11 +10,11 @@
if test "$PHP_MSSQL" = "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
FREETDS_INSTALLATION_DIR=$i
FREETDS_INCLUDE_DIR=$i/include
break
- elif test -f $i/include/freetds/tds.h; then
+ elif test -f $i/include/freetds/sybdb.h; then
FREETDS_INSTALLATION_DIR=$i
FREETDS_INCLUDE_DIR=$i/include/freetds
break
@@ -27,10 +27,10 @@
elif test "$PHP_MSSQL" != "no"; then
- if test -f $PHP_MSSQL/include/tds.h; then
+ if test -f $PHP_MSSQL/include/sybdb.h; then
FREETDS_INSTALLATION_DIR=$PHP_MSSQL
FREETDS_INCLUDE_DIR=$PHP_MSSQL/include
- elif test -f $PHP_MSSQL/include/freetds/tds.h; then
+ elif test -f $PHP_MSSQL/include/freetds/sybdb.h; then
FREETDS_INSTALLATION_DIR=$PHP_MSSQL
FREETDS_INCLUDE_DIR=$PHP_MSSQL/include/freetds
else
@@ -38,8 +38,8 @@
fi
fi
- if test ! -r "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.a" && test ! -r
"$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.so"; then
- AC_MSG_ERROR(Could not find
$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.[a|so])
+ if test ! -r "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a" && test ! -r
"$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.so"; then
+ AC_MSG_ERROR(Could not find
$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.[a|so])
fi
PHP_ADD_INCLUDE($FREETDS_INCLUDE_DIR)
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_dblib/config.m4?r1=1.2.2.2.2.1&r2=1.2.2.2.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
php-src/ext/pdo_dblib/config.m4:1.2.2.2.2.2
--- php-src/ext/pdo_dblib/config.m4:1.2.2.2.2.1 Tue Jul 3 17:25:34 2007
+++ php-src/ext/pdo_dblib/config.m4 Sat Oct 4 13:19:22 2008
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.2.2.2.2.1 2007/07/03 17:25:34 sniper Exp $
+dnl $Id: config.m4,v 1.2.2.2.2.2 2008/10/04 13:19:22 felipe Exp $
dnl
if test "$PHP_PDO" != "no"; then
@@ -13,11 +13,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;
@@ -30,10 +30,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
@@ -45,8 +45,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
