|
 |
4746ec6 |
diff -up mozilla/security/nss/lib/Makefile.nolocalsql mozilla/security/nss/lib/Makefile
|
|
|
4746ec6 |
--- mozilla/security/nss/lib/Makefile.nolocalsql 2007-11-06 15:12:37.000000000 +0100
|
|
|
4746ec6 |
+++ mozilla/security/nss/lib/Makefile 2007-11-06 15:13:35.000000000 +0100
|
|
|
4746ec6 |
@@ -62,11 +62,11 @@ ifeq ($(OS_TARGET), WINCE)
|
|
|
4746ec6 |
DIRS := $(filter-out fortcrypt,$(DIRS))
|
|
|
4746ec6 |
endif
|
|
|
4746ec6 |
|
|
|
4746ec6 |
-ifndef MOZILLA_CLIENT
|
|
|
4746ec6 |
-ifndef NSS_USE_SYSTEM_SQLITE
|
|
|
4746ec6 |
-DIRS := sqlite $(DIRS)
|
|
|
4746ec6 |
-endif
|
|
|
4746ec6 |
-endif
|
|
|
4746ec6 |
+#ifndef MOZILLA_CLIENT
|
|
|
4746ec6 |
+#ifndef NSS_USE_SYSTEM_SQLITE
|
|
|
4746ec6 |
+#DIRS := sqlite $(DIRS)
|
|
|
4746ec6 |
+#endif
|
|
|
4746ec6 |
+#endif
|
|
|
4746ec6 |
|
|
|
4746ec6 |
#######################################################################
|
|
|
4746ec6 |
# (5) Execute "global" rules. (OPTIONAL) #
|
|
|
4746ec6 |
diff -up mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql mozilla/security/nss/lib/softoken/legacydb/manifest.mn
|
|
|
4746ec6 |
--- mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql 2007-11-06 15:10:59.000000000 +0100
|
|
|
4746ec6 |
+++ mozilla/security/nss/lib/softoken/legacydb/manifest.mn 2007-11-06 15:11:07.000000000 +0100
|
|
|
4746ec6 |
@@ -46,9 +46,9 @@ MAPFILE = $(OBJDIR)/nssdbm.def
|
|
|
4746ec6 |
|
|
|
4746ec6 |
DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\"
|
|
|
4746ec6 |
|
|
|
4746ec6 |
-ifdef MOZILLA_CLIENT
|
|
|
4746ec6 |
-INCLUDES += -I$(DIST)/include/sqlite3
|
|
|
4746ec6 |
-endif
|
|
|
4746ec6 |
+#ifdef MOZILLA_CLIENT
|
|
|
4746ec6 |
+#INCLUDES += -I$(DIST)/include/sqlite3
|
|
|
4746ec6 |
+#endif
|
|
|
4746ec6 |
|
|
|
4746ec6 |
CSRCS = \
|
|
|
4746ec6 |
dbmshim.c \
|
|
|
4746ec6 |
diff -up mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql mozilla/security/nss/lib/softoken/manifest.mn
|
|
|
4746ec6 |
--- mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql 2007-11-06 15:08:14.000000000 +0100
|
|
|
4746ec6 |
+++ mozilla/security/nss/lib/softoken/manifest.mn 2007-11-06 15:10:21.000000000 +0100
|
|
|
4746ec6 |
@@ -47,9 +47,9 @@ MAPFILE = $(OBJDIR)/softokn.def
|
|
|
4746ec6 |
|
|
|
4746ec6 |
DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\" -DSHLIB_VERSION=\"$(LIBRARY_VERSION)\"
|
|
|
4746ec6 |
|
|
|
4746ec6 |
-ifdef MOZILLA_CLIENT
|
|
|
4746ec6 |
-INCLUDES += -I$(DIST)/include/sqlite3
|
|
|
4746ec6 |
-endif
|
|
|
4746ec6 |
+#ifdef MOZILLA_CLIENT
|
|
|
4746ec6 |
+#INCLUDES += -I$(DIST)/include/sqlite3
|
|
|
4746ec6 |
+#endif
|
|
|
4746ec6 |
|
|
|
4746ec6 |
EXPORTS = \
|
|
|
4746ec6 |
pkcs11.h \
|
|
|
4746ec6 |
diff -up mozilla/security/nss/lib/softoken/config.mk.nolocalsql mozilla/security/nss/lib/softoken/config.mk
|