archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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

Browse source
This commit is contained in:
Elizabeth Marie Smith 2008-08-05 20:22:53 +00:00
parent 1dddb79a32
commit 8a515d6b51
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ext/pdo_sqlite/config.w32
View file

@ -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");

4
ext/sqlite3/config.w32
View file

@ -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");
}
}