equal
deleted
inserted
replaced
5 References: |
5 References: |
6 |
6 |
7 diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in |
7 diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in |
8 --- a/config/autoconf.mk.in |
8 --- a/config/autoconf.mk.in |
9 +++ b/config/autoconf.mk.in |
9 +++ b/config/autoconf.mk.in |
10 @@ -571,16 +571,20 @@ MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS |
10 @@ -582,16 +582,20 @@ MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS |
11 |
11 |
12 GLIB_CFLAGS = @GLIB_CFLAGS@ |
12 GLIB_CFLAGS = @GLIB_CFLAGS@ |
13 GLIB_LIBS = @GLIB_LIBS@ |
13 GLIB_LIBS = @GLIB_LIBS@ |
14 GLIB_GMODULE_LIBS = @GLIB_GMODULE_LIBS@ |
14 GLIB_GMODULE_LIBS = @GLIB_GMODULE_LIBS@ |
15 LIBIDL_CFLAGS = @LIBIDL_CFLAGS@ |
15 LIBIDL_CFLAGS = @LIBIDL_CFLAGS@ |
29 MDDEPDIR := @MDDEPDIR@ |
29 MDDEPDIR := @MDDEPDIR@ |
30 CC_WRAPPER = @CC_WRAPPER@ |
30 CC_WRAPPER = @CC_WRAPPER@ |
31 diff --git a/configure.in b/configure.in |
31 diff --git a/configure.in b/configure.in |
32 --- a/configure.in |
32 --- a/configure.in |
33 +++ b/configure.in |
33 +++ b/configure.in |
34 @@ -8610,16 +8610,31 @@ AC_SUBST(QCMS_LIBS) |
34 @@ -8507,16 +8507,31 @@ AC_SUBST(QCMS_LIBS) |
35 |
35 |
36 dnl ======================================================== |
36 dnl ======================================================== |
37 dnl HarfBuzz |
37 dnl HarfBuzz |
38 dnl ======================================================== |
38 dnl ======================================================== |
39 MOZ_HARFBUZZ_LIBS='$(DEPTH)/gfx/harfbuzz/src/$(LIB_PREFIX)mozharfbuzz.$(LIB_SUFFIX)' |
39 MOZ_HARFBUZZ_LIBS='$(DEPTH)/gfx/harfbuzz/src/$(LIB_PREFIX)mozharfbuzz.$(LIB_SUFFIX)' |
64 dnl disable xul |
64 dnl disable xul |
65 dnl ======================================================== |
65 dnl ======================================================== |
66 diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in |
66 diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in |
67 --- a/security/manager/ssl/src/Makefile.in |
67 --- a/security/manager/ssl/src/Makefile.in |
68 +++ b/security/manager/ssl/src/Makefile.in |
68 +++ b/security/manager/ssl/src/Makefile.in |
69 @@ -117,19 +117,20 @@ CSRCS += md4.c |
69 @@ -114,19 +114,20 @@ CSRCS += md4.c |
70 |
70 |
71 |
71 |
72 EXTRA_DEPS = $(NSS_DEP_LIBS) |
72 EXTRA_DEPS = $(NSS_DEP_LIBS) |
73 |
73 |
74 DEFINES += -DNSS_ENABLE_ECC |
74 DEFINES += -DNSS_ENABLE_ECC |
113 #include "nsSSLThread.h" |
113 #include "nsSSLThread.h" |
114 #include "nsCertVerificationThread.h" |
114 #include "nsCertVerificationThread.h" |
115 |
115 |
116 #include "nsNetUtil.h" |
116 #include "nsNetUtil.h" |
117 #include "nsAppDirectoryServiceDefs.h" |
117 #include "nsAppDirectoryServiceDefs.h" |
118 @@ -1658,18 +1665,34 @@ nsNSSComponent::InitializeNSS(PRBool sho |
118 @@ -1733,18 +1740,34 @@ nsNSSComponent::InitializeNSS(PRBool sho |
119 ConfigureInternalPKCS11Token(); |
119 ConfigureInternalPKCS11Token(); |
120 |
120 |
121 // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs |
121 // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs |
122 // module by NSS_Initialize because we will load it in InstallLoadableRoots |
122 // module by NSS_Initialize because we will load it in InstallLoadableRoots |
123 // later. It also allows us to work around a bug in the system NSS in |
123 // later. It also allows us to work around a bug in the system NSS in |
153 } |
153 } |
154 else { |
154 else { |
155 diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in |
155 diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in |
156 --- a/toolkit/library/Makefile.in |
156 --- a/toolkit/library/Makefile.in |
157 +++ b/toolkit/library/Makefile.in |
157 +++ b/toolkit/library/Makefile.in |
158 @@ -169,17 +169,17 @@ ifndef MOZ_ENABLE_LIBXUL |
158 @@ -139,17 +139,17 @@ ifdef MOZ_DEBUG |
159 EXTRA_DSO_LDOPTS += \ |
159 EXTRA_DSO_LDOPTS += -INCREMENTAL:NO |
160 $(MOZ_COMPONENT_LIBS) \ |
|
161 $(MOZ_JS_LIBS) \ |
|
162 $(NULL) |
|
163 endif |
160 endif |
|
161 endif |
|
162 |
|
163 EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) |
164 |
164 |
165 DEFINES += -DIMPL_XREAPI |
165 DEFINES += -DIMPL_XREAPI |
166 |
166 |
167 -EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB) |
167 -EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB) |
168 +EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB) $(NSSHELPER_LIBS) |
168 +EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB) $(NSSHELPER_LIBS) |