- up to 5.3.13

[packages/php.git] / php-tds.patch

diff --git a/php-tds.patch b/php-tds.patch
index 3f3114700976a775d92a07a89e1db6477de0cd31..ef036a71d8255d8c1c8b328c90b15b89471e0fdd 100644 (file)
--- a/php-tds.patch
+++ b/php-tds.patch
@@ -1,80 +1,11 @@
---- php/ext/mssql/config.m4~   2007-07-03 19:25:34.000000000 +0200
-+++ php/ext/mssql/config.m4    2008-06-16 10:28:41.960540536 +0200
-@@ -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])
+--- php-5.3.3/ext/sybase_ct/config.m4~ 2010-07-07 13:15:24.000000000 +0300
++++ php-5.3.3/ext/sybase_ct/config.m4  2010-07-24 19:21:13.897144810 +0300
+@@ -31,7 +31,7 @@
    fi
- 
-   PHP_ADD_INCLUDE($FREETDS_INCLUDE_DIR)
---- php/ext/pdo_dblib/config.m4~       2007-07-03 19:25:34.000000000 +0200
-+++ php/ext/pdo_dblib/config.m4        2008-06-16 10:31:41.526355657 +0200
-@@ -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_ADD_LIBPATH($SYBASE_CT_LIBDIR, SYBASE_CT_SHARED_LIBADD)
+-  if test -f $SYBASE_CT_INCDIR/tds.h || test -f $SYBASE_CT_INCDIR/tds_sysdep_public.h; then
++  if test -f $SYBASE_CT_INCDIR/tds.h || test -f $SYBASE_CT_INCDIR/tds_sysdep_public.h || test -f $SYBASE_CT_INCDIR/sybdb.h; then
+     PHP_ADD_LIBRARY(ct,, SYBASE_CT_SHARED_LIBADD)
+     SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lct"
+   elif test -f $SYBASE_CT_INCDIR/libsybct64; then