From 92a98a2e95353b340b859fd8f31defeb2116509b Mon Sep 17 00:00:00 2001
From: Ted Mielczarek <ted.mielczarek@gmail.com>
Date: Tue, 15 Dec 2009 01:52:57 -0500
Subject: [PATCH] Rename sqlite3 library to mozsqlite3, fixes compile problems
 and crashes on Mac OS X. b=513747 r=sdwilsh

---
 browser/installer/package-manifest.in | 2 +-
 browser/installer/removed-files.in    | 1 +
 configure.in                          | 2 +-
 db/sqlite3/src/Makefile.in            | 2 +-
 db/sqlite3/src/sqlite.def             | 2 +-
 security/manager/Makefile.in          | 5 ++++-
 xpcom/stub/Makefile.in                | 2 +-
 7 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index 57664937d74c..e228d42fa10d 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -90,7 +90,7 @@
 #elifdef XP_OS2
 @BINPATH@/plugins/npnulos2.dll
 #endif
-@BINPATH@/@DLL_PREFIX@sqlite3@DLL_SUFFIX@
+@BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
 @BINPATH@/README.txt
 @BINPATH@/LICENSE
 @BINPATH@/blocklist.xml
diff --git a/browser/installer/removed-files.in b/browser/installer/removed-files.in
index 496a7e25044c..e09d1376018a 100644
--- a/browser/installer/removed-files.in
+++ b/browser/installer/removed-files.in
@@ -843,4 +843,5 @@ components/brwsrcmp.dll
 components/nsUpdateService.js
 components/nsUpdateServiceStub.js
 #endif
+@DLL_PREFIX@sqlite3@DLL_SUFFIX@
 old-homepage-default.properties
diff --git a/configure.in b/configure.in
index 7f751c858039..ac6a93f5f092 100644
--- a/configure.in
+++ b/configure.in
@@ -6182,7 +6182,7 @@ MOZ_NATIVE_SQLITE= )
 if test -z "$MOZ_NATIVE_SQLITE"
 then
     SQLITE_CFLAGS=
-    SQLITE_LIBS='$(call EXPAND_LIBNAME_PATH,sqlite3,$(DIST)/lib)'
+    SQLITE_LIBS='$(call EXPAND_LIBNAME_PATH,mozsqlite3,$(DIST)/lib)'
 else
     PKG_CHECK_MODULES(SQLITE, sqlite3 >= $SQLITE_VERSION)
 fi
diff --git a/db/sqlite3/src/Makefile.in b/db/sqlite3/src/Makefile.in
index 9cbc0af22968..ab0196276168 100644
--- a/db/sqlite3/src/Makefile.in
+++ b/db/sqlite3/src/Makefile.in
@@ -46,7 +46,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE           = sqlite3
-LIBRARY_NAME     = sqlite3
+LIBRARY_NAME     = mozsqlite3
 FORCE_SHARED_LIB = 1
 VISIBILITY_FLAGS =
 LIB_IS_C_ONLY    = 1
diff --git a/db/sqlite3/src/sqlite.def b/db/sqlite3/src/sqlite.def
index 7b56079713ff..26e9571fd361 100644
--- a/db/sqlite3/src/sqlite.def
+++ b/db/sqlite3/src/sqlite.def
@@ -33,7 +33,7 @@
 ;
 ; ***** END LICENSE BLOCK *****
 
-LIBRARY sqlite3.dll
+LIBRARY mozsqlite3.dll
 
 EXPORTS
         sqlite3_aggregate_context
diff --git a/security/manager/Makefile.in b/security/manager/Makefile.in
index 5b2eabd6081c..19efa4e9dff0 100644
--- a/security/manager/Makefile.in
+++ b/security/manager/Makefile.in
@@ -183,6 +183,9 @@ DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1
 DEFAULT_GMAKE_FLAGS += NO_MDUPDATE=1
 DEFAULT_GMAKE_FLAGS += NSS_ENABLE_ECC=1
 DEFAULT_GMAKE_FLAGS += IMPORT_LIB_SUFFIX=".$(IMPORT_LIB_SUFFIX)"
+ifndef MOZ_NATIVE_SQLITE
+DEFAULT_GMAKE_FLAGS += SQLITE=$(call EXPAND_LIBNAME,mozsqlite3)
+endif
 ifdef NSS_DISABLE_DBM 
 DEFAULT_GMAKE_FLAGS += NSS_DISABLE_DBM=1
 endif
@@ -320,7 +323,7 @@ ifndef NSS_DISABLE_DBM
 endif
 	$(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
 ifdef ENABLE_TESTS
-	# Need certutil binary for mochitest certificates generation
+# Need certutil binary for mochitest certificates generation
 	$(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
 	$(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/certutil $(DEFAULT_GMAKE_FLAGS)
 	$(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/pk12util $(DEFAULT_GMAKE_FLAGS)
diff --git a/xpcom/stub/Makefile.in b/xpcom/stub/Makefile.in
index 843677daa5e3..f4f9ee88afc8 100644
--- a/xpcom/stub/Makefile.in
+++ b/xpcom/stub/Makefile.in
@@ -83,7 +83,7 @@ DEPENDENT_LIBS_LIST += \
 ifdef MOZ_ENABLE_LIBXUL
 
 DEPENDENT_LIBS_LIST += \
-	$(LIB_PREFIX)sqlite3$(DLL_SUFFIX) \
+	$(LIB_PREFIX)mozsqlite3$(DLL_SUFFIX) \
 	$(LIB_PREFIX)nssutil3$(DLL_SUFFIX) \
 	$(LIB_PREFIX)softokn3$(DLL_SUFFIX) \
 	$(LIB_PREFIX)nss3$(DLL_SUFFIX) \