From: Elizabeth Marie Smith <auroraeosrose@php.net>
Date: Tue, 5 Aug 2008 20:22:53 +0000 (+0000)
Subject: Some fancy detection for sqlite3 and pdo_sqlite3 - so the two extensions don't depend... 
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~860
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8a515d6b51b31593352131c923c4bc9d0284226b;p=php

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
---

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