5 References: |
5 References: |
6 |
6 |
7 diff --git a/configure.in b/configure.in |
7 diff --git a/configure.in b/configure.in |
8 --- a/configure.in |
8 --- a/configure.in |
9 +++ b/configure.in |
9 +++ b/configure.in |
10 @@ -7999,16 +7999,31 @@ AC_SUBST(QCMS_LIBS) |
10 @@ -8042,16 +8042,31 @@ if test "$MOZ_ENABLE_SKIA"; then |
11 |
11 MOZ_ENABLE_SKIA_GPU=1 |
12 dnl ======================================================== |
12 AC_DEFINE(USE_SKIA_GPU) |
13 dnl HarfBuzz |
13 AC_SUBST(MOZ_ENABLE_SKIA_GPU) |
14 dnl ======================================================== |
14 fi |
15 MOZ_HARFBUZZ_LIBS='$(DEPTH)/gfx/harfbuzz/src/$(LIB_PREFIX)mozharfbuzz.$(LIB_SUFFIX)' |
15 fi |
16 AC_SUBST(MOZ_HARFBUZZ_LIBS) |
16 AC_SUBST(MOZ_ENABLE_SKIA) |
17 |
17 |
18 dnl ======================================================== |
18 dnl ======================================================== |
19 +dnl Check for nss-shared-helper |
19 +dnl Check for nss-shared-helper |
20 +dnl ======================================================== |
20 +dnl ======================================================== |
21 + |
21 + |
29 +AC_SUBST(MOZ_ENABLE_NSSHELPER) |
29 +AC_SUBST(MOZ_ENABLE_NSSHELPER) |
30 +AC_SUBST(NSSHELPER_CFLAGS) |
30 +AC_SUBST(NSSHELPER_CFLAGS) |
31 +AC_SUBST(NSSHELPER_LIBS) |
31 +AC_SUBST(NSSHELPER_LIBS) |
32 + |
32 + |
33 +dnl ======================================================== |
33 +dnl ======================================================== |
34 dnl SIL Graphite |
34 dnl disable xul |
35 dnl ======================================================== |
35 dnl ======================================================== |
36 MOZ_GRAPHITE_LIBS='$(DEPTH)/gfx/graphite2/src/$(LIB_PREFIX)mozgraphite2.$(LIB_SUFFIX)' |
36 MOZ_ARG_DISABLE_BOOL(xul, |
37 AC_SUBST(MOZ_GRAPHITE_LIBS) |
37 [ --disable-xul Disable XUL], |
38 |
38 MOZ_XUL= ) |
39 dnl ======================================================== |
39 if test "$MOZ_XUL"; then |
40 dnl OTS |
40 AC_DEFINE(MOZ_XUL) |
41 dnl ======================================================== |
41 else |
42 diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in |
42 diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in |
43 --- a/security/manager/ssl/src/Makefile.in |
43 new file mode 100644 |
|
44 --- /dev/null |
44 +++ b/security/manager/ssl/src/Makefile.in |
45 +++ b/security/manager/ssl/src/Makefile.in |
45 @@ -4,8 +4,11 @@ |
46 @@ -0,0 +1,8 @@ |
46 # License, v. 2.0. If a copy of the MPL was not distributed with this |
47 +#! gmake |
47 # file, You can obtain one at http://mozilla.org/MPL/2.0/. |
48 +# |
48 |
49 +# This Source Code Form is subject to the terms of the Mozilla Public |
49 DEFINES += \ |
50 +# License, v. 2.0. If a copy of the MPL was not distributed with this |
50 -DNSS_ENABLE_ECC \ |
51 +# file, You can obtain one at http://mozilla.org/MPL/2.0/. |
51 -DDLL_PREFIX=\"$(DLL_PREFIX)\" \ |
|
52 -DDLL_SUFFIX=\"$(DLL_SUFFIX)\" \ |
|
53 $(NULL) |
|
54 + |
52 + |
55 +LOCAL_INCLUDES += $(NSSHELPER_CFLAGS) |
53 +LOCAL_INCLUDES += $(NSSHELPER_CFLAGS) |
56 +EXTRA_DSO_LDOPTS += $(NSSHELPER_LIBS) |
54 +EXTRA_DSO_LDOPTS += $(NSSHELPER_LIBS) |
57 diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp |
55 diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp |
58 --- a/security/manager/ssl/src/nsNSSComponent.cpp |
56 --- a/security/manager/ssl/src/nsNSSComponent.cpp |
79 #include "mozilla/Telemetry.h" |
77 #include "mozilla/Telemetry.h" |
80 #include "nsCertVerificationThread.h" |
78 #include "nsCertVerificationThread.h" |
81 #include "nsAppDirectoryServiceDefs.h" |
79 #include "nsAppDirectoryServiceDefs.h" |
82 #include "nsComponentManagerUtils.h" |
80 #include "nsComponentManagerUtils.h" |
83 #include "nsDirectoryServiceDefs.h" |
81 #include "nsDirectoryServiceDefs.h" |
84 @@ -1263,18 +1270,35 @@ nsNSSComponent::InitializeNSS(bool showW |
82 @@ -1207,18 +1214,35 @@ nsNSSComponent::InitializeNSS() |
85 ConfigureInternalPKCS11Token(); |
83 ConfigureInternalPKCS11Token(); |
86 |
84 |
87 // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs |
85 // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs |
88 // module by NSS_Initialize because we will load it in InstallLoadableRoots |
86 // module by NSS_Initialize because we will load it in InstallLoadableRoots |
89 // later. It also allows us to work around a bug in the system NSS in |
87 // later. It also allows us to work around a bug in the system NSS in |
113 +#endif |
111 +#endif |
114 |
112 |
115 if (init_rv != SECSuccess) { |
113 if (init_rv != SECSuccess) { |
116 PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("can not init NSS r/w in %s\n", profileStr.get())); |
114 PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("can not init NSS r/w in %s\n", profileStr.get())); |
117 |
115 |
118 if (suppressWarningPref) { |
116 // try to init r/o |
119 which_nss_problem = problem_none; |
117 init_flags |= NSS_INIT_READONLY; |
120 } |
118 init_rv = ::NSS_Initialize(profileStr.get(), "", "", |
121 else { |
119 SECMOD_DB, init_flags); |
122 diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in |
120 diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in |
123 --- a/toolkit/library/Makefile.in |
121 --- a/toolkit/library/Makefile.in |
124 +++ b/toolkit/library/Makefile.in |
122 +++ b/toolkit/library/Makefile.in |
125 @@ -484,17 +484,17 @@ LOCAL_INCLUDES += -I$(topsrcdir)/intl/un |
123 @@ -245,17 +245,17 @@ endif |
126 ifneq (,$(filter OS2 WINNT,$(OS_ARCH))) |
124 ifneq (,$(filter OS2 WINNT,$(OS_ARCH))) |
127 SDK_LIBRARY = $(IMPORT_LIBRARY) |
125 SDK_LIBRARY = $(IMPORT_LIBRARY) |
128 else |
126 else |
129 SDK_LIBRARY = $(SHARED_LIBRARY) |
127 SDK_LIBRARY = $(SHARED_LIBRARY) |
130 endif |
128 endif |