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 @@ -577,16 +577,20 @@ MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS |
10 @@ -571,16 +571,20 @@ MOZ_LIBNOTIFY_LIBS = @MOZ_LIBNOTIFY_LIBS |
|
11 MOZ_ENABLE_LIBNOTIFY = @MOZ_ENABLE_LIBNOTIFY@ |
|
12 |
|
13 MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS@ |
11 |
14 |
12 GLIB_CFLAGS = @GLIB_CFLAGS@ |
15 GLIB_CFLAGS = @GLIB_CFLAGS@ |
13 GLIB_LIBS = @GLIB_LIBS@ |
16 GLIB_LIBS = @GLIB_LIBS@ |
14 GLIB_GMODULE_LIBS = @GLIB_GMODULE_LIBS@ |
17 GLIB_GMODULE_LIBS = @GLIB_GMODULE_LIBS@ |
15 LIBIDL_CFLAGS = @LIBIDL_CFLAGS@ |
|
16 LIBIDL_LIBS = @LIBIDL_LIBS@ |
|
17 STATIC_LIBIDL = @STATIC_LIBIDL@ |
|
18 |
18 |
19 +MOZ_ENABLE_NSSHELPER = @MOZ_ENABLE_NSSHELPER@ |
19 +MOZ_ENABLE_NSSHELPER = @MOZ_ENABLE_NSSHELPER@ |
20 +NSSHELPER_CFLAGS = @NSSHELPER_CFLAGS@ |
20 +NSSHELPER_CFLAGS = @NSSHELPER_CFLAGS@ |
21 +NSSHELPER_LIBS = @NSSHELPER_LIBS@ |
21 +NSSHELPER_LIBS = @NSSHELPER_LIBS@ |
22 + |
22 + |
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 @@ -8680,16 +8680,31 @@ AC_SUBST(QCMS_LIBS) |
34 @@ -8016,16 +8016,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 @@ -114,12 +114,14 @@ CSRCS += md4.c |
69 @@ -113,12 +113,14 @@ 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 |
107 #include "nsSSLThread.h" |
107 #include "nsSSLThread.h" |
108 #include "nsCertVerificationThread.h" |
108 #include "nsCertVerificationThread.h" |
109 |
109 |
110 #include "nsNetUtil.h" |
110 #include "nsNetUtil.h" |
111 #include "nsAppDirectoryServiceDefs.h" |
111 #include "nsAppDirectoryServiceDefs.h" |
112 @@ -1748,18 +1755,34 @@ nsNSSComponent::InitializeNSS(PRBool sho |
112 @@ -1727,18 +1734,34 @@ nsNSSComponent::InitializeNSS(PRBool sho |
113 ConfigureInternalPKCS11Token(); |
113 ConfigureInternalPKCS11Token(); |
114 |
114 |
115 // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs |
115 // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs |
116 // module by NSS_Initialize because we will load it in InstallLoadableRoots |
116 // module by NSS_Initialize because we will load it in InstallLoadableRoots |
117 // later. It also allows us to work around a bug in the system NSS in |
117 // later. It also allows us to work around a bug in the system NSS in |
147 } |
147 } |
148 else { |
148 else { |
149 diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in |
149 diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in |
150 --- a/toolkit/library/Makefile.in |
150 --- a/toolkit/library/Makefile.in |
151 +++ b/toolkit/library/Makefile.in |
151 +++ b/toolkit/library/Makefile.in |
152 @@ -139,17 +139,17 @@ ifdef MOZ_DEBUG |
152 @@ -138,17 +138,17 @@ ifdef MOZ_DEBUG |
153 EXTRA_DSO_LDOPTS += -INCREMENTAL:NO |
153 EXTRA_DSO_LDOPTS += -INCREMENTAL:NO |
154 endif |
154 endif |
155 endif |
155 endif |
156 |
156 |
157 EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) |
157 EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) |