edink Thu May 11 21:43:59 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/pdo_dblib config.w32
/php-src/ext/pdo_firebird config.w32
/php-src/ext/pdo_mysql config.w32
/php-src/ext/pdo_oci config.w32
/php-src/ext/pdo_pgsql config.w32
/php-src/ext/pdo_sqlite config.w32
Log:
Remove pecl includes (Steph), except pdo_odbc which will remain broke
http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo_dblib/config.w32?r1=1.7&r2=1.7.4.1&diff_format=u
Index: php-src/ext/pdo_dblib/config.w32
diff -u php-src/ext/pdo_dblib/config.w32:1.7
php-src/ext/pdo_dblib/config.w32:1.7.4.1
--- php-src/ext/pdo_dblib/config.w32:1.7 Wed Feb 16 18:09:26 2005
+++ php-src/ext/pdo_dblib/config.w32 Thu May 11 21:43:58 2006
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.7 2005/02/16 18:09:26 wez Exp $
+// $Id: config.w32,v 1.7.4.1 2006/05/11 21:43:58 edink Exp $
// vim:ft=javascript
ARG_WITH("pdo-dblib", "freetds dblib (Sybase, MS-SQL) support for PDO", "no");
@@ -12,7 +12,7 @@
PHP_PDO_DBLIB, null, null, true))
{
EXTENSION("pdo_dblib", "pdo_dblib.c dblib_driver.c
dblib_stmt.c");
- ADD_FLAG('CFLAGS_PDO_DBLIB', "/I pecl /I ..\\pecl /D
PDO_DBLIB_FLAVOUR=\\\"freetds\\\"");
+ ADD_FLAG('CFLAGS_PDO_DBLIB', "/D
PDO_DBLIB_FLAVOUR=\\\"freetds\\\"");
}
ADD_EXTENSION_DEP('pdo_dblib', 'pdo');
}
@@ -63,7 +63,7 @@
ADD_FLAG("CFLAGS_PDO_MSSQL", "/DPDO_DBLIB_IS_MSSQL=" +
PDO_DBLIB_FLAVOUR);
PDO_DBLIB_FLAVOUR = "MSSQL_" + PDO_DBLIB_FLAVOUR;
}
- ADD_FLAG('CFLAGS_PDO_MSSQL', "/I pecl /I ..\\pecl /D
PDO_DBLIB_FLAVOUR=\\\"" + PDO_DBLIB_FLAVOUR + "\\\"");
+ ADD_FLAG('CFLAGS_PDO_MSSQL', "/D PDO_DBLIB_FLAVOUR=\\\"" +
PDO_DBLIB_FLAVOUR + "\\\"");
}
ADD_EXTENSION_DEP('pdo_mssql', 'pdo');
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo_firebird/config.w32?r1=1.6&r2=1.6.4.1&diff_format=u
Index: php-src/ext/pdo_firebird/config.w32
diff -u php-src/ext/pdo_firebird/config.w32:1.6
php-src/ext/pdo_firebird/config.w32:1.6.4.1
--- php-src/ext/pdo_firebird/config.w32:1.6 Sat Jun 12 18:42:13 2004
+++ php-src/ext/pdo_firebird/config.w32 Thu May 11 21:43:59 2006
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.6 2004/06/12 18:42:13 abies Exp $
+// $Id: config.w32,v 1.6.4.1 2006/05/11 21:43:59 edink Exp $
// vim:ft=javascript
ARG_WITH("pdo-firebird", "Firebird support for PDO", "no");
@@ -10,7 +10,6 @@
) && CHECK_HEADER_ADD_INCLUDE("ibase.h", "CFLAGS_PDO_FIREBIRD",
PHP_PHP_BUILD + "\\interbase\\include;" + PHP_PDO_FIREBIRD)) {
EXTENSION("pdo_firebird", "pdo_firebird.c firebird_driver.c
firebird_statement.c");
- ADD_FLAG('CFLAGS_PDO_FIREBIRD', "/I ..\\pecl");
} else {
WARNING("pdo_firebird not enabled; libraries and headers not
found");
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo_mysql/config.w32?r1=1.4&r2=1.4.4.1&diff_format=u
Index: php-src/ext/pdo_mysql/config.w32
diff -u php-src/ext/pdo_mysql/config.w32:1.4
php-src/ext/pdo_mysql/config.w32:1.4.4.1
--- php-src/ext/pdo_mysql/config.w32:1.4 Sun Aug 15 15:56:33 2004
+++ php-src/ext/pdo_mysql/config.w32 Thu May 11 21:43:59 2006
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.4 2004/08/15 15:56:33 helly Exp $
+// $Id: config.w32,v 1.4.4.1 2006/05/11 21:43:59 edink Exp $
// vim:ft=javascript
ARG_WITH("pdo-mysql", "MySQL support for PDO", "no");
@@ -7,7 +7,6 @@
if (CHECK_LIB("libmysql.lib", "pdo_mysql", PHP_PDO_MYSQL) &&
CHECK_HEADER_ADD_INCLUDE("mysql.h", "CFLAGS_PDO_MYSQL",
PHP_PHP_BUILD + "\\include\\mysql;" + PHP_PDO_MYSQL)) {
EXTENSION("pdo_mysql", "pdo_mysql.c mysql_driver.c
mysql_statement.c");
- ADD_FLAG('CFLAGS_PDO_MYSQL', "/I ..\\pecl");
} else {
WARNING("pdo_mysql not enabled; libraries and headers not
found");
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo_oci/config.w32?r1=1.6&r2=1.6.4.1&diff_format=u
Index: php-src/ext/pdo_oci/config.w32
diff -u php-src/ext/pdo_oci/config.w32:1.6
php-src/ext/pdo_oci/config.w32:1.6.4.1
--- php-src/ext/pdo_oci/config.w32:1.6 Thu Jan 20 15:54:35 2005
+++ php-src/ext/pdo_oci/config.w32 Thu May 11 21:43:59 2006
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.6 2005/01/20 15:54:35 edink Exp $
+// $Id: config.w32,v 1.6.4.1 2006/05/11 21:43:59 edink Exp $
// vim:ft=javascript
ARG_WITH("pdo-oci", "Oracle OCI support for PDO", "no");
@@ -32,7 +32,6 @@
pdo_oci_inc_dir = FSO.GetParentFolderName(pdo_oci_header);
EXTENSION('pdo_oci', 'pdo_oci.c oci_driver.c oci_statement.c');
- ADD_FLAG('CFLAGS_PDO_OCI', "/I ..\\pecl");
/* probe for some functions not present in older versions */
pdo_oci_inc_dir = FSO.GetFolder(pdo_oci_header);
@@ -70,7 +69,6 @@
pdo_oci_inc_dir = FSO.GetParentFolderName(pdo_oci_header);
EXTENSION('pdo_oci8', 'pdo_oci.c oci_driver.c oci_statement.c',
null, null, null, "ext\\pdo_oci8");
- ADD_FLAG('CFLAGS_PDO_OCI8', "/I ..\\pecl");
/* probe for some functions not present in older versions */
pdo_oci_inc_dir = FSO.GetFolder(pdo_oci_header);
http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo_pgsql/config.w32?r1=1.4.2.1&r2=1.4.2.1.2.1&diff_format=u
Index: php-src/ext/pdo_pgsql/config.w32
diff -u php-src/ext/pdo_pgsql/config.w32:1.4.2.1
php-src/ext/pdo_pgsql/config.w32:1.4.2.1.2.1
--- php-src/ext/pdo_pgsql/config.w32:1.4.2.1 Tue Mar 14 10:49:18 2006
+++ php-src/ext/pdo_pgsql/config.w32 Thu May 11 21:43:59 2006
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.4.2.1 2006/03/14 10:49:18 edink Exp $
+// $Id: config.w32,v 1.4.2.1.2.1 2006/05/11 21:43:59 edink Exp $
// vim:ft=javascript
ARG_WITH("pdo-pgsql", "PostgreSQL support for PDO", "no");
@@ -12,7 +12,6 @@
ADD_FLAG('CFLAGS_PDO_PGSQL', "/D HAVE_PG_CONFIG_H");
}
- ADD_FLAG('CFLAGS_PDO_PGSQL', "/I ..\\pecl");
AC_DEFINE('HAVE_PDO_PGSQL', 1, 'Have PostgreSQL library');
ADD_FLAG('CFLAGS_PDO_PGSQL', "/D HAVE_PQPARAMETERSTATUS=1 /D
HAVE_PQPROTOCOLVERSION=1 /D HAVE_PGTRANSACTIONSTATUS=1 /D
HAVE_PQUNESCAPEBYTEA=1 /D HAVE_PQRESULTERRORFIELD=1");
} else {
http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo_sqlite/config.w32?r1=1.6.2.1&r2=1.6.2.1.2.1&diff_format=u
Index: php-src/ext/pdo_sqlite/config.w32
diff -u php-src/ext/pdo_sqlite/config.w32:1.6.2.1
php-src/ext/pdo_sqlite/config.w32:1.6.2.1.2.1
--- php-src/ext/pdo_sqlite/config.w32:1.6.2.1 Sun Aug 28 16:53:20 2005
+++ php-src/ext/pdo_sqlite/config.w32 Thu May 11 21:43:59 2006
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.6.2.1 2005/08/28 16:53:20 iliaa Exp $
+// $Id: config.w32,v 1.6.2.1.2.1 2006/05/11 21:43:59 edink Exp $
// vim:ft=javascript
ARG_WITH("pdo-sqlite", "for pdo_sqlite support", "no");
@@ -19,7 +19,7 @@
FSO.CopyFile(configure_module_dirname +
"\\sqlite\\src\\sqlite_config.w32.h",
configure_module_dirname + "\\sqlite\\src\\config.h");
- EXTENSION("pdo_sqlite", "pdo_sqlite.c sqlite_driver.c
sqlite_statement.c", null, "/DSQLITE_OMIT_CURSOR /I" + configure_module_dirname
+ "/sqlite/src /I pecl /I ..\\pecl /I" + configure_module_dirname);
+ EXTENSION("pdo_sqlite", "pdo_sqlite.c sqlite_driver.c
sqlite_statement.c", null, "/DSQLITE_OMIT_CURSOR /I" + configure_module_dirname
+ "/sqlite/src /I" + configure_module_dirname);
ADD_SOURCES(configure_module_dirname + "/sqlite/src",
"attach.c auth.c btree.c build.c callback.c date.c delete.c
expr.c func.c hash.c insert.c \
legacy.c main.c os_mac.c os_unix.c os_win.c pager.c pragma.c
prepare.c printf.c random.c \
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
