Index: security/nss/cmd/platlibs.mk
===================================================================
RCS file: /cvsroot/mozilla/security/nss/cmd/platlibs.mk,v
retrieving revision 1.64
diff -u -p -r1.64 platlibs.mk
--- security/nss/cmd/platlibs.mk	17 Jun 2009 23:01:48 -0000	1.64
+++ security/nss/cmd/platlibs.mk	23 Nov 2009 16:08:54 -0000
@@ -80,7 +80,11 @@ endif
 endif
 endif
 
+ifdef NSS_USE_SYSTEM_SQLITE
 SQLITE=-lsqlite3
+else
+SQLITE=-lnsssqlite3
+endif
 
 ifdef NSS_DISABLE_DBM
 DBMLIB = $(NULL)
Index: security/nss/lib/softoken/config.mk
===================================================================
RCS file: /cvsroot/mozilla/security/nss/lib/softoken/config.mk,v
retrieving revision 1.29
diff -u -p -r1.29 config.mk
--- security/nss/lib/softoken/config.mk	11 Jun 2009 00:55:48 -0000	1.29
+++ security/nss/lib/softoken/config.mk	23 Nov 2009 16:08:55 -0000
@@ -83,12 +83,16 @@ EXTRA_SHARED_LIBS += \
 	-L$(DIST)/lib \
 	-L$(NSSUTIL_LIB_DIR) \
 	-lnssutil3 \
-	-lsqlite3 \
 	-L$(NSPR_LIB_DIR) \
 	-lplc4 \
 	-lplds4 \
 	-lnspr4 \
 	$(NULL)
+ifdef NSS_USE_SYSTEM_SQLITE
+EXTRA_SHARED_LIBS += -lsqlite3
+else
+EXTRA_SHARED_LIBS += -lnsssqlite3
+endif
 endif
 
 ifeq ($(OS_TARGET),AIX)
Index: security/nss/lib/sqlite/manifest.mn
===================================================================
RCS file: /cvsroot/mozilla/security/nss/lib/sqlite/manifest.mn,v
retrieving revision 1.3
diff -u -p -r1.3 manifest.mn
--- security/nss/lib/sqlite/manifest.mn	15 Aug 2007 15:30:05 -0000	1.3
+++ security/nss/lib/sqlite/manifest.mn	23 Nov 2009 16:08:55 -0000
@@ -38,9 +38,10 @@ CORE_DEPTH = ../../..
 
 MODULE = nss
 
-LIBRARY_NAME = sqlite
+LIBRARY_NAME = nsssqlite
 LIBRARY_VERSION = 3
 MAPFILE = $(OBJDIR)/sqlite.def
+MAPFILE_SOURCE = sqlite.def
 DEFINES += -DTHREADSAFE=1
 
 EXPORTS = \