Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Bug 519550: Add the SQLITE_LIB_NAME variable for specifying an alternate
library for SQLite.  r=rrelyea.
Modified Files:
	coreconf/location.mk nss/cmd/platlibs.mk
	nss/lib/softoken/config.mk
  • Loading branch information
wtc%google.com committed Jun 12, 2010
1 parent d58f55d commit b2df3d0
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
4 changes: 4 additions & 0 deletions security/coreconf/location.mk
Expand Up @@ -99,4 +99,8 @@ ifndef SOFTOKEN_LIB_DIR
SOFTOKEN_LIB_DIR = $(DIST)/lib
endif

ifndef SQLITE_LIB_NAME
SQLITE_LIB_NAME = sqlite3
endif

MK_LOCATION = included
6 changes: 2 additions & 4 deletions security/nss/cmd/platlibs.mk
Expand Up @@ -80,8 +80,6 @@ endif
endif
endif

SQLITE=-lsqlite3

ifdef NSS_DISABLE_DBM
DBMLIB = $(NULL)
else
Expand Down Expand Up @@ -130,7 +128,7 @@ EXTRA_LIBS += \
$(DIST)/lib/$(LIB_PREFIX)nssb.$(LIB_SUFFIX) \
$(PKIXLIB) \
$(DBMLIB) \
$(DIST)/lib/$(LIB_PREFIX)sqlite3.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)$(SQLITE_LIB_NAME).$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)nssutil3.$(LIB_SUFFIX) \
$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.$(LIB_SUFFIX) \
$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.$(LIB_SUFFIX) \
Expand Down Expand Up @@ -179,7 +177,7 @@ endif
# $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
EXTRA_SHARED_LIBS += \
-L$(DIST)/lib \
$(SQLITE) \
-l$(SQLITE_LIB_NAME) \
-L$(NSSUTIL_LIB_DIR) \
-lnssutil3 \
-L$(NSPR_LIB_DIR) \
Expand Down
9 changes: 4 additions & 5 deletions security/nss/lib/softoken/config.mk
Expand Up @@ -55,9 +55,9 @@ RESNAME = $(LIBRARY_NAME).rc
ifdef NS_USE_GCC
EXTRA_SHARED_LIBS += \
-L$(DIST)/lib \
-l$(SQLITE_LIB_NAME) \
-L$(NSSUTIL_LIB_DIR) \
-lnssutil3 \
-lsqlite3 \
-L$(NSPR_LIB_DIR) \
-lplc4 \
-lplds4 \
Expand All @@ -66,12 +66,11 @@ EXTRA_SHARED_LIBS += \
else # ! NS_USE_GCC

EXTRA_SHARED_LIBS += \
$(DIST)/lib/sqlite3.lib \
$(DIST)/lib/nssutil3.lib \
$(DIST)/lib/$(SQLITE_LIB_NAME).lib \
$(NSSUTIL_LIB_DIR)/nssutil3.lib \
$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.lib \
$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.lib \
$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4.lib \
$(DIST)/lib/nssutil3.lib \
$(NULL)
endif # NS_USE_GCC

Expand All @@ -81,9 +80,9 @@ else
# $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
EXTRA_SHARED_LIBS += \
-L$(DIST)/lib \
-l$(SQLITE_LIB_NAME) \
-L$(NSSUTIL_LIB_DIR) \
-lnssutil3 \
-lsqlite3 \
-L$(NSPR_LIB_DIR) \
-lplc4 \
-lplds4 \
Expand Down

0 comments on commit b2df3d0

Please sign in to comment.