diff options
| author | Elizabeth Marie Smith <auroraeosrose@php.net> | 2008-08-05 20:22:53 +0000 |
|---|---|---|
| committer | Elizabeth Marie Smith <auroraeosrose@php.net> | 2008-08-05 20:22:53 +0000 |
| commit | 8a515d6b51b31593352131c923c4bc9d0284226b (patch) | |
| tree | 788e801ed9fa8d9c854a1ea770b6e0b3ad0b0b09 | |
| parent | 1dddb79a32ff3afc4ce7dc9e530052c32b565566 (diff) | |
| download | php-git-8a515d6b51b31593352131c923c4bc9d0284226b.tar.gz | |
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
| -rw-r--r-- | ext/pdo_sqlite/config.w32 | 7 | ||||
| -rw-r--r-- | ext/sqlite3/config.w32 | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/ext/pdo_sqlite/config.w32 b/ext/pdo_sqlite/config.w32 index fdb19b95d6..f9494eee0c 100644 --- a/ext/pdo_sqlite/config.w32 +++ b/ext/pdo_sqlite/config.w32 @@ -5,9 +5,12 @@ 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"); diff --git a/ext/sqlite3/config.w32 b/ext/sqlite3/config.w32 index 81c3c41b16..8c766f41a9 100644 --- a/ext/sqlite3/config.w32 +++ b/ext/sqlite3/config.w32 @@ -10,8 +10,4 @@ if (PHP_SQLITE3 != "no") { 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"); - } } |