Sophie

Sophie

distrib > Mandriva > 2009.0 > x86_64 > by-pkgid > b3489653ea2a43d6a251076149bd77e6 > files > 10

nss-3.12.6-0.1mdv2009.0.src.rpm

diff -Naur nss-3.12.6/mozilla/security/nss/lib/Makefile nss-3.12.6.oden/mozilla/security/nss/lib/Makefile
--- nss-3.12.6/mozilla/security/nss/lib/Makefile	2010-02-16 20:37:04.000000000 +0100
+++ nss-3.12.6.oden/mozilla/security/nss/lib/Makefile	2010-03-23 18:26:23.837200554 +0100
@@ -62,11 +62,11 @@
 ZLIB_SRCDIR = zlib  # Add the zlib directory to DIRS.
 endif
 
-ifndef MOZILLA_CLIENT
-ifndef NSS_USE_SYSTEM_SQLITE
-SQLITE_SRCDIR = sqlite  # Add the sqlite directory to DIRS.
-endif
-endif
+#ifndef MOZILLA_CLIENT
+#ifndef NSS_USE_SYSTEM_SQLITE
+#SQLITE_SRCDIR = sqlite  # Add the sqlite directory to DIRS.
+#endif
+#endif
 
 ifndef MOZILLA_CLIENT
 ifeq ($(OS_ARCH),Linux)
diff -Naur nss-3.12.6/mozilla/security/nss/lib/softoken/legacydb/manifest.mn nss-3.12.6.oden/mozilla/security/nss/lib/softoken/legacydb/manifest.mn
--- nss-3.12.6/mozilla/security/nss/lib/softoken/legacydb/manifest.mn	2007-07-19 23:36:50.000000000 +0200
+++ nss-3.12.6.oden/mozilla/security/nss/lib/softoken/legacydb/manifest.mn	2010-03-23 18:24:03.813231015 +0100
@@ -46,9 +46,9 @@
 
 DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\"
 
-ifdef MOZILLA_CLIENT
-INCLUDES += -I$(DIST)/include/sqlite3
-endif
+#ifdef MOZILLA_CLIENT
+#INCLUDES += -I$(DIST)/include/sqlite3
+#endif
 
 CSRCS = \
 	dbmshim.c \
diff -Naur nss-3.12.6/mozilla/security/nss/lib/softoken/manifest.mn nss-3.12.6.oden/mozilla/security/nss/lib/softoken/manifest.mn
--- nss-3.12.6/mozilla/security/nss/lib/softoken/manifest.mn	2009-03-25 17:21:37.000000000 +0100
+++ nss-3.12.6.oden/mozilla/security/nss/lib/softoken/manifest.mn	2010-03-23 18:24:03.813231015 +0100
@@ -47,9 +47,9 @@
 
 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
+#ifdef MOZILLA_CLIENT
+#INCLUDES += -I$(DIST)/include/sqlite3
+#endif
 
 EXPORTS = \
 	secmodt.h \