auroraeosrose Tue Aug 5 20:16:21 2008 UTC
Modified files: (Branch: PHP_5_3)
/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.6.2.1.2.3.2.5&r2=1.6.2.1.2.3.2.6&diff_format=u
Index: php-src/ext/pdo_sqlite/config.w32
diff -u php-src/ext/pdo_sqlite/config.w32:1.6.2.1.2.3.2.5
php-src/ext/pdo_sqlite/config.w32:1.6.2.1.2.3.2.6
--- php-src/ext/pdo_sqlite/config.w32:1.6.2.1.2.3.2.5 Thu Jul 24 14:25:33 2008
+++ php-src/ext/pdo_sqlite/config.w32 Tue Aug 5 20:16:21 2008
@@ -1,13 +1,16 @@
-// $Id: config.w32,v 1.6.2.1.2.3.2.5 2008/07/24 14:25:33 scottmac Exp $
+// $Id: config.w32,v 1.6.2.1.2.3.2.6 2008/08/05 20:16:21 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.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/sqlite3/config.w32
diff -u php-src/ext/sqlite3/config.w32:1.1.2.1
php-src/ext/sqlite3/config.w32:1.1.2.2
--- php-src/ext/sqlite3/config.w32:1.1.2.1 Fri Jul 25 02:44:57 2008
+++ php-src/ext/sqlite3/config.w32 Tue Aug 5 20:16:21 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $
+// $Id: config.w32,v 1.1.2.2 2008/08/05 20:16:21 auroraeosrose Exp $
// vim:ft=javascript
ARG_WITH("sqlite3", "SQLite 3 support", "no");
@@ -10,8 +10,4 @@
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");
- }
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
