equal
deleted
inserted
replaced
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 @@ -8162,16 +8162,31 @@ AC_SUBST(QCMS_LIBS) |
10 @@ -7999,16 +7999,31 @@ AC_SUBST(QCMS_LIBS) |
11 |
11 |
12 dnl ======================================================== |
12 dnl ======================================================== |
13 dnl HarfBuzz |
13 dnl HarfBuzz |
14 dnl ======================================================== |
14 dnl ======================================================== |
15 MOZ_HARFBUZZ_LIBS='$(DEPTH)/gfx/harfbuzz/src/$(LIB_PREFIX)mozharfbuzz.$(LIB_SUFFIX)' |
15 MOZ_HARFBUZZ_LIBS='$(DEPTH)/gfx/harfbuzz/src/$(LIB_PREFIX)mozharfbuzz.$(LIB_SUFFIX)' |
40 dnl OTS |
40 dnl OTS |
41 dnl ======================================================== |
41 dnl ======================================================== |
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 --- a/security/manager/ssl/src/Makefile.in |
44 +++ b/security/manager/ssl/src/Makefile.in |
44 +++ b/security/manager/ssl/src/Makefile.in |
45 @@ -5,8 +5,11 @@ |
45 @@ -4,8 +4,11 @@ |
|
46 # License, v. 2.0. If a copy of the MPL was not distributed with this |
46 # file, You can obtain one at http://mozilla.org/MPL/2.0/. |
47 # file, You can obtain one at http://mozilla.org/MPL/2.0/. |
47 |
48 |
48 EXPORT_LIBRARY = 1 |
|
49 DEFINES += \ |
49 DEFINES += \ |
50 -DNSS_ENABLE_ECC \ |
50 -DNSS_ENABLE_ECC \ |
51 -DDLL_PREFIX=\"$(DLL_PREFIX)\" \ |
51 -DDLL_PREFIX=\"$(DLL_PREFIX)\" \ |
52 -DDLL_SUFFIX=\"$(DLL_SUFFIX)\" \ |
52 -DDLL_SUFFIX=\"$(DLL_SUFFIX)\" \ |
53 $(NULL) |
53 $(NULL) |
79 #include "nsCertVerificationThread.h" |
79 #include "nsCertVerificationThread.h" |
80 #include "nsAppDirectoryServiceDefs.h" |
80 #include "nsAppDirectoryServiceDefs.h" |
81 #include "nsComponentManagerUtils.h" |
81 #include "nsComponentManagerUtils.h" |
82 #include "nsDirectoryServiceDefs.h" |
82 #include "nsDirectoryServiceDefs.h" |
83 #include "nsICertOverrideService.h" |
83 #include "nsICertOverrideService.h" |
84 @@ -1136,18 +1143,35 @@ nsNSSComponent::InitializeNSS(bool showW |
84 @@ -1254,18 +1261,35 @@ nsNSSComponent::InitializeNSS(bool showW |
85 ConfigureInternalPKCS11Token(); |
85 ConfigureInternalPKCS11Token(); |
86 |
86 |
87 // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs |
87 // 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 |
88 // 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 |
89 // later. It also allows us to work around a bug in the system NSS in |
120 } |
120 } |
121 else { |
121 else { |
122 diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in |
122 diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in |
123 --- a/toolkit/library/Makefile.in |
123 --- a/toolkit/library/Makefile.in |
124 +++ b/toolkit/library/Makefile.in |
124 +++ b/toolkit/library/Makefile.in |
125 @@ -473,17 +473,17 @@ LOCAL_INCLUDES += -I$(topsrcdir)/intl/un |
125 @@ -484,17 +484,17 @@ LOCAL_INCLUDES += -I$(topsrcdir)/intl/un |
126 ifneq (,$(filter OS2 WINNT,$(OS_ARCH))) |
126 ifneq (,$(filter OS2 WINNT,$(OS_ARCH))) |
127 SDK_LIBRARY = $(IMPORT_LIBRARY) |
127 SDK_LIBRARY = $(IMPORT_LIBRARY) |
128 else |
128 else |
129 SDK_LIBRARY = $(SHARED_LIBRARY) |
129 SDK_LIBRARY = $(SHARED_LIBRARY) |
130 endif |
130 endif |