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 @@ -8309,16 +8309,31 @@ AC_SUBST(QCMS_LIBS) |
10 @@ -8330,16 +8330,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 @@ -87,10 +87,13 @@ endif |
45 @@ -18,10 +18,13 @@ LIBXUL_LIBRARY = 1 |
46 CSRCS += md4.c |
46 CSRCS += md4.c |
47 |
47 |
48 DEFINES += \ |
48 DEFINES += \ |
49 -DNSS_ENABLE_ECC \ |
49 -DNSS_ENABLE_ECC \ |
50 -DDLL_PREFIX=\"$(DLL_PREFIX)\" \ |
50 -DDLL_PREFIX=\"$(DLL_PREFIX)\" \ |
76 +#endif |
76 +#endif |
77 + |
77 + |
78 #include "nsNSSComponent.h" |
78 #include "nsNSSComponent.h" |
79 |
79 |
80 #include "CertVerifier.h" |
80 #include "CertVerifier.h" |
81 #include "nsNSSCallbacks.h" |
|
82 #include "nsNSSIOLayer.h" |
|
83 #include "nsCertVerificationThread.h" |
81 #include "nsCertVerificationThread.h" |
84 |
82 #include "nsAppDirectoryServiceDefs.h" |
85 #include "nsNetUtil.h" |
83 #include "nsComponentManagerUtils.h" |
86 @@ -1721,18 +1728,34 @@ nsNSSComponent::InitializeNSS(bool showW |
84 #include "nsDirectoryServiceDefs.h" |
|
85 #include "nsICertOverrideService.h" |
|
86 @@ -1132,18 +1139,34 @@ nsNSSComponent::InitializeNSS(bool showW |
87 ConfigureInternalPKCS11Token(); |
87 ConfigureInternalPKCS11Token(); |
88 |
88 |
89 // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs |
89 // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs |
90 // module by NSS_Initialize because we will load it in InstallLoadableRoots |
90 // module by NSS_Initialize because we will load it in InstallLoadableRoots |
91 // later. It also allows us to work around a bug in the system NSS in |
91 // later. It also allows us to work around a bug in the system NSS in |
121 } |
121 } |
122 else { |
122 else { |
123 diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in |
123 diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in |
124 --- a/toolkit/library/Makefile.in |
124 --- a/toolkit/library/Makefile.in |
125 +++ b/toolkit/library/Makefile.in |
125 +++ b/toolkit/library/Makefile.in |
126 @@ -510,17 +510,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO |
126 @@ -490,17 +490,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO |
127 endif |
127 endif |
128 endif |
128 endif |
129 endif |
129 endif |
130 |
130 |
131 EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) |
131 EXTRA_DSO_LDOPTS += $(LIBS_DIR) |
132 |
132 |
133 DEFINES += -DIMPL_XREAPI |
133 DEFINES += -DIMPL_XREAPI |
134 |
134 |
135 -EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB) |
135 -EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB) |
136 +EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB) $(NSSHELPER_LIBS) |
136 +EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB) $(NSSHELPER_LIBS) |