]>
Commit | Line | Data |
---|---|---|
8bae4b9c AM |
1 | --- php/ext/mssql/config.m4~ 2007-07-03 19:25:34.000000000 +0200 |
2 | +++ php/ext/mssql/config.m4 2008-06-16 10:28:41.960540536 +0200 | |
3 | @@ -10,11 +10,11 @@ | |
4 | ||
5 | if test "$PHP_MSSQL" = "yes"; then | |
6 | for i in /usr/local /usr; do | |
7 | - if test -f $i/include/tds.h; then | |
8 | + if test -f $i/include/sybdb.h; then | |
9 | FREETDS_INSTALLATION_DIR=$i | |
10 | FREETDS_INCLUDE_DIR=$i/include | |
11 | break | |
12 | - elif test -f $i/include/freetds/tds.h; then | |
13 | + elif test -f $i/include/freetds/sybdb.h; then | |
14 | FREETDS_INSTALLATION_DIR=$i | |
15 | FREETDS_INCLUDE_DIR=$i/include/freetds | |
16 | break | |
17 | @@ -27,10 +27,10 @@ | |
18 | ||
19 | elif test "$PHP_MSSQL" != "no"; then | |
20 | ||
21 | - if test -f $PHP_MSSQL/include/tds.h; then | |
22 | + if test -f $PHP_MSSQL/include/sybdb.h; then | |
23 | FREETDS_INSTALLATION_DIR=$PHP_MSSQL | |
24 | FREETDS_INCLUDE_DIR=$PHP_MSSQL/include | |
25 | - elif test -f $PHP_MSSQL/include/freetds/tds.h; then | |
26 | + elif test -f $PHP_MSSQL/include/freetds/sybdb.h; then | |
27 | FREETDS_INSTALLATION_DIR=$PHP_MSSQL | |
28 | FREETDS_INCLUDE_DIR=$PHP_MSSQL/include/freetds | |
29 | else | |
30 | @@ -38,8 +38,8 @@ | |
31 | fi | |
32 | fi | |
33 | ||
34 | - if test ! -r "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.a" && test ! -r "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.so"; then | |
35 | - AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.[a|so]) | |
36 | + if test ! -r "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a" && test ! -r "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.so"; then | |
37 | + AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.[a|so]) | |
38 | fi | |
39 | ||
40 | PHP_ADD_INCLUDE($FREETDS_INCLUDE_DIR) | |
41 | --- php/ext/pdo_dblib/config.m4~ 2007-07-03 19:25:34.000000000 +0200 | |
42 | +++ php/ext/pdo_dblib/config.m4 2008-06-16 10:31:41.526355657 +0200 | |
43 | @@ -13,11 +13,11 @@ | |
44 | if test "$PHP_PDO_DBLIB" = "yes"; then | |
45 | ||
46 | for i in /usr/local /usr; do | |
47 | - if test -f $i/include/tds.h; then | |
48 | + if test -f $i/include/sybdb.h; then | |
49 | PDO_FREETDS_INSTALLATION_DIR=$i | |
50 | PDO_FREETDS_INCLUDE_DIR=$i/include | |
51 | break | |
52 | - elif test -f $i/include/freetds/tds.h; then | |
53 | + elif test -f $i/include/freetds/sybdb.h; then | |
54 | PDO_FREETDS_INSTALLATION_DIR=$i | |
55 | PDO_FREETDS_INCLUDE_DIR=$i/include/freetds | |
56 | break; | |
57 | @@ -30,10 +30,10 @@ | |
58 | ||
59 | elif test "$PHP_PDO_DBLIB" != "no"; then | |
60 | ||
61 | - if test -f $PHP_PDO_DBLIB/include/tds.h; then | |
62 | + if test -f $PHP_PDO_DBLIB/include/sybdb.h; then | |
63 | PDO_FREETDS_INSTALLATION_DIR=$PHP_PDO_DBLIB | |
64 | PDO_FREETDS_INCLUDE_DIR=$PHP_PDO_DBLIB/include | |
65 | - elif test -f $PHP_PDO_DBLIB/include/freetds/tds.h; then | |
66 | + elif test -f $PHP_PDO_DBLIB/include/freetds/sybdb.h; then | |
67 | PDO_FREETDS_INSTALLATION_DIR=$PHP_PDO_DBLIB | |
68 | PDO_FREETDS_INCLUDE_DIR=$PHP_PDO_DBLIB/include/freetds | |
69 | else | |
70 | @@ -45,8 +45,8 @@ | |
71 | PHP_LIBDIR=lib | |
72 | fi | |
73 | ||
74 | - if test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.a" && test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.so"; then | |
75 | - AC_MSG_ERROR(Could not find $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.[a|so]) | |
76 | + if test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a" && test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.so"; then | |
77 | + AC_MSG_ERROR(Could not find $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.[a|so]) | |
78 | fi | |
79 | ||
80 | PHP_ADD_INCLUDE($PDO_FREETDS_INCLUDE_DIR) | |
fa00d9da AM |
81 | --- php/ext/sybase_ct/config.m4~ 2007-07-03 19:25:35.000000000 +0200 |
82 | +++ php/ext/sybase_ct/config.m4 2008-06-16 10:42:20.463792334 +0200 | |
83 | @@ -31,7 +31,7 @@ | |
84 | fi | |
85 | ||
86 | PHP_ADD_LIBPATH($SYBASE_CT_LIBDIR, SYBASE_CT_SHARED_LIBADD) | |
87 | - if test -f $SYBASE_CT_INCDIR/tds.h; then | |
88 | + if test -f $SYBASE_CT_INCDIR/sybdb.h; then | |
89 | PHP_ADD_LIBRARY(ct,, SYBASE_CT_SHARED_LIBADD) | |
90 | SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lct" | |
91 | else |