--- mozilla/security/coreconf/config.mk.fix3 2009-04-20 19:28:04 +0400 +++ mozilla/security/coreconf/config.mk 2009-04-20 19:28:11 +0400 @@ -206,4 +206,7 @@ endif # in libnss3 which are present for binary compatibility only DEFINES += -DUSE_UTIL_DIRECTLY USE_UTIL_DIRECTLY = 1 +ifdef NSS_USE_SYSTEM_SQLITE +INCLUDES += $(shell pkg-config --cflags-only-I mozsqlite3) +endif --- mozilla/security/nss/cmd/platlibs.mk.fix3 2009-04-20 19:28:11 +0400 +++ mozilla/security/nss/cmd/platlibs.mk 2009-04-20 19:28:11 +0400 @@ -71,9 +71,9 @@ EXTRA_SHARED_LIBS += -Wl,+b,'$$ORIGIN/.. endif endif endif -SQLITE=-lsqlite3 +SQLITE = $(shell pkg-config --libs mozsqlite3) ifdef NSS_DISABLE_DBM DBMLIB = $(NULL) else --- mozilla/security/nss/lib/softoken/config.mk.fix3 2009-04-20 19:28:04 +0400 +++ mozilla/security/nss/lib/softoken/config.mk 2009-04-20 19:34:17 +0400 @@ -56,9 +56,9 @@ ifdef NS_USE_GCC EXTRA_SHARED_LIBS += \ -L$(DIST)/lib \ -L$(NSSUTIL_LIB_DIR) \ -lnssutil3 \ - -lsqlite3 \ + $(shell pkg-config --libs mozsqlite3) \ -L$(NSPR_LIB_DIR) \ -lplc4 \ -lplds4 \ -lnspr4 \ @@ -82,16 +82,20 @@ else EXTRA_SHARED_LIBS += \ -L$(DIST)/lib \ -L$(NSSUTIL_LIB_DIR) \ -lnssutil3 \ - -lsqlite3 \ + $(shell pkg-config --libs mozsqlite3) \ -L$(NSPR_LIB_DIR) \ -lplc4 \ -lplds4 \ -lnspr4 \ $(NULL) endif +ifdef NSS_USE_SYSTEM_SQLITE +INCLUDES += $(shell pkg-config --cflags-only-I mozsqlite3) +endif + ifeq ($(OS_TARGET),AIX) OS_LIBS += -lpthread endif