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 @@ -8108,16 +8108,31 @@ AC_SUBST(QCMS_LIBS) |
10 @@ -8275,16 +8275,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 MOZ_GRAPHITE_LIBS= |
40 MOZ_GRAPHITE_LIBS= |
41 fi |
41 fi |
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 @@ -93,10 +93,13 @@ DEFINES += \ |
45 @@ -92,16 +92,19 @@ DEFINES += \ |
46 $(NULL) |
46 $(NULL) |
47 |
47 |
48 EXPORTS += \ |
48 EXPORTS += \ |
49 CryptoTask.h \ |
49 CryptoTask.h \ |
50 nsNSSShutDown.h \ |
50 nsNSSShutDown.h \ |
52 $(NULL) |
52 $(NULL) |
53 |
53 |
54 +LOCAL_INCLUDES += $(NSSHELPER_CFLAGS) |
54 +LOCAL_INCLUDES += $(NSSHELPER_CFLAGS) |
55 +EXTRA_DSO_LDOPTS += $(NSSHELPER_LIBS) |
55 +EXTRA_DSO_LDOPTS += $(NSSHELPER_LIBS) |
56 + |
56 + |
|
57 EXPORTS_NAMESPACES = mozilla |
|
58 |
|
59 EXPORTS_mozilla += \ |
|
60 PublicSSL.h \ |
|
61 $(NULL) |
|
62 |
57 include $(topsrcdir)/config/rules.mk |
63 include $(topsrcdir)/config/rules.mk |
58 |
64 |
59 diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp |
65 diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp |
60 --- a/security/manager/ssl/src/nsNSSComponent.cpp |
66 --- a/security/manager/ssl/src/nsNSSComponent.cpp |
61 +++ b/security/manager/ssl/src/nsNSSComponent.cpp |
67 +++ b/security/manager/ssl/src/nsNSSComponent.cpp |
81 #include "nsCertVerificationThread.h" |
87 #include "nsCertVerificationThread.h" |
82 |
88 |
83 #include "nsNetUtil.h" |
89 #include "nsNetUtil.h" |
84 #include "nsAppDirectoryServiceDefs.h" |
90 #include "nsAppDirectoryServiceDefs.h" |
85 #include "nsDirectoryService.h" |
91 #include "nsDirectoryService.h" |
86 @@ -1735,18 +1742,34 @@ nsNSSComponent::InitializeNSS(bool showW |
92 @@ -1682,18 +1689,34 @@ nsNSSComponent::InitializeNSS(bool showW |
87 ConfigureInternalPKCS11Token(); |
93 ConfigureInternalPKCS11Token(); |
88 |
94 |
89 // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs |
95 // 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 |
96 // 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 |
97 // later. It also allows us to work around a bug in the system NSS in |
121 } |
127 } |
122 else { |
128 else { |
123 diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in |
129 diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in |
124 --- a/toolkit/library/Makefile.in |
130 --- a/toolkit/library/Makefile.in |
125 +++ b/toolkit/library/Makefile.in |
131 +++ b/toolkit/library/Makefile.in |
126 @@ -484,17 +484,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO |
132 @@ -500,17 +500,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO |
127 endif |
133 endif |
128 endif |
134 endif |
129 endif |
135 endif |
130 |
136 |
131 EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) |
137 EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) |