2 files changed, 14 insertions, 14 deletions
diff --git a/3rdParty/SQLite/SConscript b/3rdParty/SQLite/SConscript
index 9b9fead..ed08716 100644
--- a/3rdParty/SQLite/SConscript
+++ b/3rdParty/SQLite/SConscript
@@ -10,10 +10,10 @@ if env.get("SQLITE_BUNDLED", False) :
 		env["SQLITE_FLAGS"] = {
 				"CPPPATH": [Dir(".")],
 				"LIBPATH": [Dir(".")],
-				"LIBS": ["SQLite"],
+				"LIBS": ["Swiften_SQLite"],
 			}
 
 	if env["SCONS_STAGE"] == "build" :
 		myenv = env.Clone()
 		myenv.Replace(CCFLAGS = [flag for flag in env["CCFLAGS"] if flag not in ["-W", "-Wall"]])
-		myenv.StaticLibrary("SQLite", ["sqlite3.c"], CPPPATH = ["."])
+		myenv.StaticLibrary("Swiften_SQLite", ["sqlite3.c"], CPPPATH = ["."])
diff --git a/3rdParty/SQLiteAsync/SConscript b/3rdParty/SQLiteAsync/SConscript
index 1bb4268..515c9e4 100644
--- a/3rdParty/SQLiteAsync/SConscript
+++ b/3rdParty/SQLiteAsync/SConscript
@@ -1,20 +1,20 @@
 Import("env")
 
+if env.get("SQLITE_ASYNC_BUNDLED", False) :
 
 ################################################################################
 # Flags
 ################################################################################
 
+	if env["SCONS_STAGE"] == "flags" :
+		env["SQLITE_ASYNC_FLAGS"] = {
+				"CPPPATH": [Dir(".")],
+				"LIBPATH": [Dir(".")],
+				"LIBS": ["Swiften_SQLiteAsync"],
+			}
 
-if env["SCONS_STAGE"] == "flags" :
-	env["SQLITE_ASYNC_FLAGS"] = {
-			"CPPPATH": [Dir(".")],
-			"LIBPATH": [Dir(".")],
-			"LIBS": ["SQLiteAsync"],
-		}
-
-if env["SCONS_STAGE"] == "build" :
-	myenv = env.Clone()
-	myenv.Replace(CCFLAGS = [flag for flag in env["CCFLAGS"] if flag not in ["-W", "-Wall"]])
-	myenv.UseFlags(env.get("SQLITE_FLAGS", {}))
-	myenv.StaticLibrary("SQLiteAsync", ["sqlite3async.c"])
+	if env["SCONS_STAGE"] == "build" :
+		myenv = env.Clone()
+		myenv.Replace(CCFLAGS = [flag for flag in env["CCFLAGS"] if flag not in ["-W", "-Wall"]])
+		myenv.UseFlags(env.get("SQLITE_FLAGS", {}))
+		myenv.StaticLibrary("Swiften_SQLiteAsync", ["sqlite3async.c"])