auroraeosrose Tue Aug 5 20:22:54 2008 UTC
Modified files:
/php-src/ext/pdo_sqlite config.w32
/php-src/ext/sqlite3 config.w32
Log:
Some fancy detection for sqlite3 and pdo_sqlite3 - so the two extensions
don't depend on each other if shared, and don't try to put two versions of the
sqlite3 lib if static
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/config.w32?r1=1.12&r2=1.13&diff_format=u
Index: php-src/ext/pdo_sqlite/config.w32
diff -u php-src/ext/pdo_sqlite/config.w32:1.12
php-src/ext/pdo_sqlite/config.w32:1.13
--- php-src/ext/pdo_sqlite/config.w32:1.12 Thu Jul 24 14:20:51 2008
+++ php-src/ext/pdo_sqlite/config.w32 Tue Aug 5 20:22:53 2008
@@ -1,13 +1,16 @@
-// $Id: config.w32,v 1.12 2008/07/24 14:20:51 scottmac Exp $
+// $Id: config.w32,v 1.13 2008/08/05 20:22:53 auroraeosrose Exp $
// vim:ft=javascript
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 + "/libsqlite /I" + configure_module_dirname);
- ADD_SOURCES(configure_module_dirname + "/libsqlite", "sqlite3.c",
"pdo_sqlite");
-
+
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
+ if (PHP_PDO_SQLITE_SHARED || PHP_SQLITE3_SHARED || PHP_SQLITE3 == 'no')
{
+ ADD_SOURCES(configure_module_dirname + "/../sqlite3/libsqlite",
"sqlite3.c", "pdo_sqlite");
+ }
}
ARG_WITH("pdo-sqlite-external", "for pdo_sqlite support from an external dll",
"no");
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/config.w32?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/sqlite3/config.w32
diff -u php-src/ext/sqlite3/config.w32:1.2 php-src/ext/sqlite3/config.w32:1.3
--- php-src/ext/sqlite3/config.w32:1.2 Sat Jul 26 01:23:45 2008
+++ php-src/ext/sqlite3/config.w32 Tue Aug 5 20:22:53 2008
@@ -1,17 +1,13 @@
-// $Id: config.w32,v 1.2 2008/07/26 01:23:45 scottmac Exp $
-// vim:ft=javascript
-
-ARG_WITH("sqlite3", "SQLite 3 support", "no");
-
-if (PHP_SQLITE3 != "no") {
- ADD_FLAG("CFLAGS_SQLITE3", "/D SQLITE_THREADSAFE=1 /D
SQLITE_ENABLE_FTS3=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");
-
- AC_DEFINE("HAVE_SQLITE3", 1, "SQLite support");
-
- if (!PHP_SQLITE3_SHARED) {
- ADD_DEF_FILE(configure_module_dirname + "\\php_sqlite3.def");
- }
-}
+// $Id: config.w32,v 1.3 2008/08/05 20:22:53 auroraeosrose Exp $
+// vim:ft=javascript
+
+ARG_WITH("sqlite3", "SQLite 3 support", "no");
+
+if (PHP_SQLITE3 != "no") {
+ ADD_FLAG("CFLAGS_SQLITE3", "/D SQLITE_THREADSAFE=1 /D
SQLITE_ENABLE_FTS3=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");
+
+ AC_DEFINE("HAVE_SQLITE3", 1, "SQLite support");
+}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
