mirror of
https://abf.rosa.ru/djam/firefox-esr68.git
synced 2025-02-24 10:22:56 +00:00
60 lines
1.9 KiB
Diff
60 lines
1.9 KiB
Diff
|
diff -p -up mozilla-beta/browser/installer/Makefile.in.system-nss-nspr mozilla-beta/browser/installer/Makefile.in
|
||
|
|
--- mozilla-beta/browser/installer/Makefile.in.system-nss-nspr 2012-07-25 04:15:07.000000000 +0200
|
||
|
|
+++ mozilla-beta/browser/installer/Makefile.in 2012-07-27 23:32:09.367999971 +0200
|
||
|
|
@@ -84,6 +84,14 @@ ifdef MOZ_JSDEBUGGER
|
||
|
|
DEFINES += -DMOZ_JSDEBUGGER
|
||
|
|
endif
|
||
|
|
|
||
|
|
+ifdef MOZ_NATIVE_NSPR
|
||
|
|
+DEFINES += -DMOZ_NATIVE_NSPR=1
|
||
|
|
+endif
|
||
|
|
+
|
||
|
|
+ifdef MOZ_NATIVE_NSS
|
||
|
|
+DEFINES += -DMOZ_NATIVE_NSS=1
|
||
|
|
+endif
|
||
|
|
+
|
||
|
|
ifdef NECKO_WIFI
|
||
|
|
DEFINES += -DNECKO_WIFI
|
||
|
|
endif
|
||
|
|
diff -p -up mozilla-beta/browser/installer/package-manifest.in.system-nss-nspr mozilla-beta/browser/installer/package-manifest.in
|
||
|
|
--- mozilla-beta/browser/installer/package-manifest.in.system-nss-nspr 2012-07-25 04:15:07.000000000 +0200
|
||
|
|
+++ mozilla-beta/browser/installer/package-manifest.in 2012-07-27 23:51:19.523000278 +0200
|
||
|
|
@@ -58,9 +58,11 @@
|
||
|
|
#ifndef MOZ_STATIC_JS
|
||
|
|
@BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
|
||
|
|
#endif
|
||
|
|
+#ifndef MOZ_NATIVE_NSPR
|
||
|
|
@BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
|
||
|
|
@BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@
|
||
|
|
@BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
|
||
|
|
+#endif
|
||
|
|
@BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
|
||
|
|
#ifdef XP_MACOSX
|
||
|
|
@BINPATH@/XUL
|
||
|
|
@@ -109,7 +111,9 @@
|
||
|
|
#endif
|
||
|
|
@BINPATH@/platform.ini
|
||
|
|
#ifndef XP_OS2
|
||
|
|
+#ifndef MOZ_NATIVE_SQLITE
|
||
|
|
@BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
|
||
|
|
+#endif
|
||
|
|
#else
|
||
|
|
@BINPATH@/mozsqlt3@DLL_SUFFIX@
|
||
|
|
#endif
|
||
|
|
@@ -579,6 +583,7 @@
|
||
|
|
; NSS libraries are signed in the staging directory,
|
||
|
|
; meaning their .chk files are created there directly.
|
||
|
|
;
|
||
|
|
+#ifndef MOZ_NATIVE_NSS
|
||
|
|
@BINPATH@/@DLL_PREFIX@freebl3@DLL_SUFFIX@
|
||
|
|
@BINPATH@/@DLL_PREFIX@nss3@DLL_SUFFIX@
|
||
|
|
@BINPATH@/@DLL_PREFIX@nssckbi@DLL_SUFFIX@
|
||
|
|
@@ -589,6 +594,7 @@
|
||
|
|
@BINPATH@/@DLL_PREFIX@smime3@DLL_SUFFIX@
|
||
|
|
@BINPATH@/@DLL_PREFIX@softokn3@DLL_SUFFIX@
|
||
|
|
@BINPATH@/@DLL_PREFIX@ssl3@DLL_SUFFIX@
|
||
|
|
+#endif
|
||
|
|
@BINPATH@/chrome/pippki@JAREXT@
|
||
|
|
@BINPATH@/chrome/pippki.manifest
|
||
|
|
@BINPATH@/components/pipboot.xpt
|