Changes for nss built with mozilla (use mozilla's sqlite).
authorrrelyea%redhat.com
Thu, 19 Jul 2007 21:36:50 +0000
changeset 7948 95ed3563e905c01c4d4ca860de8db43974648ef6
parent 7946 36e45ab2369e3f4be0a35c68e8614255d26788a2
child 7949 26960af5bfc88b445b2a1e0cb3fe443bffe4e1d6
push idunknown
push userunknown
push dateunknown
Changes for nss built with mozilla (use mozilla's sqlite).
security/nss/cmd/platlibs.mk
security/nss/lib/Makefile
security/nss/lib/softoken/legacydb/manifest.mn
security/nss/lib/softoken/manifest.mn
--- a/security/nss/cmd/platlibs.mk
+++ b/security/nss/cmd/platlibs.mk
@@ -67,21 +67,17 @@ ifeq ($(USE_64), 1)
 EXTRA_SHARED_LIBS += \
 -Wl,+b,'$$ORIGIN/../../lib/pa20_64:$$ORIGIN/../../lib/64:$$ORIGIN/../lib'
 else
 EXTRA_SHARED_LIBS += -Wl,+b,'$$ORIGIN/../lib'
 endif
 endif
 endif
 
-SQLITE=$(DIST)/lib/$(LIB_PREFIX)sqlite.$(LIB_SUFFIX)
-ifdef NSS_USE_SYSTEM_SQLITE
-	SQLITE=-lsqlite3
-endif
-
+SQLITE=-lsqlite3
 
 ifdef USE_STATIC_LIBS
 
 # can't do this in manifest.mn because OS_ARCH isn't defined there.
 ifeq ($(OS_ARCH), WINNT)
 
 DEFINES += -DNSS_USE_STATIC_LIBS
 # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
--- a/security/nss/lib/Makefile
+++ b/security/nss/lib/Makefile
@@ -57,19 +57,21 @@ include $(CORE_DEPTH)/coreconf/config.mk
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
 ifeq ($(OS_TARGET), WINCE)
 DIRS := $(filter-out fortcrypt,$(DIRS))
 endif
 
+ifndef MOZILLA_CLIENT
 ifndef NSS_USE_SYSTEM_SQLITE
 DIRS := sqlite $(DIRS)
 endif
+endif
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
 #######################################################################
 
 include $(CORE_DEPTH)/coreconf/rules.mk
 
 #######################################################################
--- a/security/nss/lib/softoken/legacydb/manifest.mn
+++ b/security/nss/lib/softoken/legacydb/manifest.mn
@@ -41,16 +41,19 @@ MODULE = nss
 REQUIRES = dbm 
 
 LIBRARY_NAME = nssdbm
 LIBRARY_VERSION = 3
 MAPFILE = $(OBJDIR)/nssdbm.def
 
 DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\"
 
+ifdef MOZILLA_CLIENT
+INCLUDES += -I$(DIST)/include/sqlite3
+endif
 
 CSRCS = \
 	dbmshim.c \
 	keydb.c \
 	lgattr.c \
 	lgcreate.c \
 	lgdestroy.c \
 	lgfind.c \
--- a/security/nss/lib/softoken/manifest.mn
+++ b/security/nss/lib/softoken/manifest.mn
@@ -42,16 +42,19 @@ DIRS = legacydb
 REQUIRES = dbm
 
 LIBRARY_NAME = softokn
 LIBRARY_VERSION = 3
 MAPFILE = $(OBJDIR)/softokn.def
 
 DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\" -DSHLIB_VERSION=\"$(LIBRARY_VERSION)\"
 
+ifdef MOZILLA_CLIENT
+INCLUDES += -I$(DIST)/include/sqlite3
+endif
 
 EXPORTS = \
 	pkcs11.h \
 	pkcs11f.h \
 	pkcs11p.h \
 	pkcs11t.h \
 	pkcs11n.h \
 	pkcs11u.h \