kalle Mon, 10 Aug 2009 16:58:53 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=287047
Log: Don't build sqlite as threadsafe if we are doing an NTS build Changed paths: U php/php-src/branches/PHP_5_3/ext/pdo_sqlite/config.w32 U php/php-src/trunk/ext/pdo_sqlite/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-08-10 16:33:24 UTC (rev 287046) +++ php/php-src/branches/PHP_5_3/ext/pdo_sqlite/config.w32 2009-08-10 16:58:53 UTC (rev 287047) @@ -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=1 /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") + " /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/pdo_sqlite/config.w32 =================================================================== --- php/php-src/trunk/ext/pdo_sqlite/config.w32 2009-08-10 16:33:24 UTC (rev 287046) +++ php/php-src/trunk/ext/pdo_sqlite/config.w32 2009-08-10 16:58:53 UTC (rev 287047) @@ -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=1 /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") + " /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
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php