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 @@ -573,16 +573,20 @@ MOZ_ENABLE_LIBNOTIFY = @MOZ_ENABLE_LIBNO |
10 @@ -540,16 +540,20 @@ MOZ_ENABLE_LIBNOTIFY = @MOZ_ENABLE_LIBNO |
11 |
11 |
12 MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS@ |
12 MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS@ |
13 MOZ_ALSA_CFLAGS = @MOZ_ALSA_CFLAGS@ |
13 MOZ_ALSA_CFLAGS = @MOZ_ALSA_CFLAGS@ |
14 |
14 |
15 GLIB_CFLAGS = @GLIB_CFLAGS@ |
15 GLIB_CFLAGS = @GLIB_CFLAGS@ |
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 + |
23 MOZ_NATIVE_MAKEDEPEND = @SYSTEM_MAKEDEPEND@ |
23 MOZ_NATIVE_MAKEDEPEND = @MOZ_NATIVE_MAKEDEPEND@ |
24 |
24 |
25 export CL_INCLUDES_PREFIX = @CL_INCLUDES_PREFIX@ |
25 CL_INCLUDES_PREFIX = @CL_INCLUDES_PREFIX@ |
26 |
26 |
27 MOZ_AUTO_DEPS = @MOZ_AUTO_DEPS@ |
27 MOZ_AUTO_DEPS = @MOZ_AUTO_DEPS@ |
28 COMPILER_DEPEND = @COMPILER_DEPEND@ |
28 COMPILER_DEPEND = @COMPILER_DEPEND@ |
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 @@ -8270,16 +8270,31 @@ AC_SUBST(QCMS_LIBS) |
34 @@ -8052,16 +8052,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 MOZ_GRAPHITE_LIBS= |
64 MOZ_GRAPHITE_LIBS= |
65 fi |
65 fi |
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 @@ -86,12 +86,14 @@ EXTRA_DEPS = $(NSS_DEP_LIBS) |
69 @@ -90,12 +90,14 @@ DEFINES += \ |
70 DEFINES += \ |
70 $(NULL) |
71 -DNSS_ENABLE_ECC \ |
71 |
72 -DDLL_PREFIX=\"$(DLL_PREFIX)\" \ |
72 EXPORTS += \ |
73 -DDLL_SUFFIX=\"$(DLL_SUFFIX)\" \ |
73 nsNSSShutDown.h \ |
74 $(NULL) |
74 $(NULL) |
75 |
75 |
76 # Use local includes because they are inserted before INCLUDES |
76 # Use local includes because they are inserted before INCLUDES |
77 # so that Mozilla's nss.h is used, not glibc's |
77 # so that Mozilla's nss.h is used, not glibc's |
78 -LOCAL_INCLUDES += $(NSS_CFLAGS) |
78 -LOCAL_INCLUDES += $(NSS_CFLAGS) |
105 #include "nsCertVerificationThread.h" |
105 #include "nsCertVerificationThread.h" |
106 |
106 |
107 #include "nsNetUtil.h" |
107 #include "nsNetUtil.h" |
108 #include "nsAppDirectoryServiceDefs.h" |
108 #include "nsAppDirectoryServiceDefs.h" |
109 #include "nsDirectoryService.h" |
109 #include "nsDirectoryService.h" |
110 @@ -1738,18 +1745,34 @@ nsNSSComponent::InitializeNSS(bool showW |
110 @@ -1740,18 +1747,34 @@ nsNSSComponent::InitializeNSS(bool showW |
111 ConfigureInternalPKCS11Token(); |
111 ConfigureInternalPKCS11Token(); |
112 |
112 |
113 // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs |
113 // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs |
114 // module by NSS_Initialize because we will load it in InstallLoadableRoots |
114 // module by NSS_Initialize because we will load it in InstallLoadableRoots |
115 // later. It also allows us to work around a bug in the system NSS in |
115 // later. It also allows us to work around a bug in the system NSS in |
145 } |
145 } |
146 else { |
146 else { |
147 diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in |
147 diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in |
148 --- a/toolkit/library/Makefile.in |
148 --- a/toolkit/library/Makefile.in |
149 +++ b/toolkit/library/Makefile.in |
149 +++ b/toolkit/library/Makefile.in |
150 @@ -446,17 +446,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO |
150 @@ -441,17 +441,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO |
151 endif |
151 endif |
152 endif |
152 endif |
153 endif |
153 endif |
154 |
154 |
155 EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) |
155 EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) |
161 |
161 |
162 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) |
162 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) |
163 CXXFLAGS += $(TK_CFLAGS) |
163 CXXFLAGS += $(TK_CFLAGS) |
164 OS_LIBS += \ |
164 OS_LIBS += \ |
165 -framework SystemConfiguration \ |
165 -framework SystemConfiguration \ |
166 -framework QuickTime \ |
166 -framework QTKit \ |
167 -framework IOKit \ |
167 -framework IOKit \ |
168 -F/System/Library/PrivateFrameworks -framework CoreUI \ |
168 -F/System/Library/PrivateFrameworks -framework CoreUI \ |