scottmac                                 Fri, 16 Oct 2009 02:22:48 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=289692

Log:
Add metadata support to the bundled version of libsqlite on Windows, part of 
bug #49206.

Will commit the new feature part separately.

Bug: http://bugs.php.net/49206 (Assigned) PDO SQLite support for 
ATTR_FETCH_TABLE_NAMES and getColumnMeta fix
      
Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/pdo_sqlite/config.w32
    U   php/php-src/branches/PHP_5_3/ext/sqlite3/config.w32
    U   php/php-src/trunk/ext/pdo_sqlite/config.w32
    U   php/php-src/trunk/ext/sqlite3/config.w32

Modified: php/php-src/branches/PHP_5_3/ext/pdo_sqlite/config.w32
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pdo_sqlite/config.w32      2009-10-16 
02:10:52 UTC (rev 289691)
+++ php/php-src/branches/PHP_5_3/ext/pdo_sqlite/config.w32      2009-10-16 
02:22:48 UTC (rev 289692)
@@ -4,7 +4,7 @@
 ARG_WITH("pdo-sqlite", "for pdo_sqlite support", "no");

 if (PHP_PDO_SQLITE != "no") {
-       EXTENSION("pdo_sqlite", "pdo_sqlite.c sqlite_driver.c 
sqlite_statement.c", null, "/DSQLITE_THREADSAFE=" + (PHP_ZTS == "yes" ? "1" : 
"0") + " /I" + configure_module_dirname + "/../sqlite3/libsqlite /I" + 
configure_module_dirname);
+       EXTENSION("pdo_sqlite", "pdo_sqlite.c sqlite_driver.c 
sqlite_statement.c", null, "/DSQLITE_THREADSAFE=" + (PHP_ZTS == "yes" ? "1" : 
"0") + " /D SQLITE_ENABLE_FTS3=1 /D SQLITE_ENABLE_COLUMN_METADATA=1 /D 
SQLITE_CORE=1 /I" + configure_module_dirname + "/../sqlite3/libsqlite /I" + 
configure_module_dirname);

        ADD_EXTENSION_DEP('pdo_sqlite', 'pdo');
        // If pdo_sqlite is static, and sqlite3 is also static, then we don't 
add a second copy of the sqlite3 libs

Modified: php/php-src/branches/PHP_5_3/ext/sqlite3/config.w32
===================================================================
--- php/php-src/branches/PHP_5_3/ext/sqlite3/config.w32 2009-10-16 02:10:52 UTC 
(rev 289691)
+++ php/php-src/branches/PHP_5_3/ext/sqlite3/config.w32 2009-10-16 02:22:48 UTC 
(rev 289692)
@@ -4,7 +4,7 @@
 ARG_WITH("sqlite3", "SQLite 3 support", "no");

 if (PHP_SQLITE3 != "no") {
-       ADD_FLAG("CFLAGS_SQLITE3", "/D SQLITE_THREADSAFE=" + (PHP_ZTS == "yes" 
? "1" : "0") + " /D SQLITE_ENABLE_FTS3=1 /D SQLITE_CORE=1 ");
+       ADD_FLAG("CFLAGS_SQLITE3", "/D SQLITE_THREADSAFE=" + (PHP_ZTS == "yes" 
? "1" : "0") + " /D SQLITE_ENABLE_FTS3=1 /D SQLITE_ENABLE_COLUMN_METADATA=1 /D 
SQLITE_CORE=1 ");
        EXTENSION("sqlite3", "sqlite3.c", null, "/I" + configure_module_dirname 
+ "/libsqlite /I" + configure_module_dirname);

        ADD_SOURCES(configure_module_dirname + "/libsqlite", "sqlite3.c", 
"sqlite3");

Modified: php/php-src/trunk/ext/pdo_sqlite/config.w32
===================================================================
--- php/php-src/trunk/ext/pdo_sqlite/config.w32 2009-10-16 02:10:52 UTC (rev 
289691)
+++ php/php-src/trunk/ext/pdo_sqlite/config.w32 2009-10-16 02:22:48 UTC (rev 
289692)
@@ -4,7 +4,7 @@
 ARG_WITH("pdo-sqlite", "for pdo_sqlite support", "no");

 if (PHP_PDO_SQLITE != "no") {
-       EXTENSION("pdo_sqlite", "pdo_sqlite.c sqlite_driver.c 
sqlite_statement.c", null, "/DSQLITE_THREADSAFE=" + (PHP_ZTS == "yes" ? "1" : 
"0") + " /I" + configure_module_dirname + "/../sqlite3/libsqlite /I" + 
configure_module_dirname);
+       EXTENSION("pdo_sqlite", "pdo_sqlite.c sqlite_driver.c 
sqlite_statement.c", null, "/DSQLITE_THREADSAFE=" + (PHP_ZTS == "yes" ? "1" : 
"0") + " /D SQLITE_ENABLE_FTS3=1 /D SQLITE_ENABLE_COLUMN_METADATA=1 /D 
SQLITE_CORE=1 /I" + configure_module_dirname + "/../sqlite3/libsqlite /I" + 
configure_module_dirname);

        ADD_EXTENSION_DEP('pdo_sqlite', 'pdo');
        // If pdo_sqlite is static, and sqlite3 is also static, then we don't 
add a second copy of the sqlite3 libs

Modified: php/php-src/trunk/ext/sqlite3/config.w32
===================================================================
--- php/php-src/trunk/ext/sqlite3/config.w32    2009-10-16 02:10:52 UTC (rev 
289691)
+++ php/php-src/trunk/ext/sqlite3/config.w32    2009-10-16 02:22:48 UTC (rev 
289692)
@@ -4,7 +4,7 @@
 ARG_WITH("sqlite3", "SQLite 3 support", "no");

 if (PHP_SQLITE3 != "no") {
-       ADD_FLAG("CFLAGS_SQLITE3", "/D SQLITE_THREADSAFE=" + (PHP_ZTS == "yes" 
? "1" : "0") + " /D SQLITE_ENABLE_FTS3=1 /D SQLITE_CORE=1 ");
+       ADD_FLAG("CFLAGS_SQLITE3", "/D SQLITE_THREADSAFE=" + (PHP_ZTS == "yes" 
? "1" : "0") + " /D SQLITE_ENABLE_FTS3=1 /D SQLITE_ENABLE_COLUMN_METADATA=1 /D 
SQLITE_CORE=1 ");
        EXTENSION("sqlite3", "sqlite3.c", null, "/I" + configure_module_dirname 
+ "/libsqlite /I" + configure_module_dirname);

        ADD_SOURCES(configure_module_dirname + "/libsqlite", "sqlite3.c", 
"sqlite3");

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to