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 @@ -567,16 +567,20 @@ MOZ_LIBNOTIFY_LIBS = @MOZ_LIBNOTIFY_LIBS |
10 @@ -581,16 +581,20 @@ MOZ_LIBNOTIFY_LIBS = @MOZ_LIBNOTIFY_LIBS |
11 MOZ_ENABLE_LIBNOTIFY = @MOZ_ENABLE_LIBNOTIFY@ |
11 MOZ_ENABLE_LIBNOTIFY = @MOZ_ENABLE_LIBNOTIFY@ |
12 |
12 |
13 MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS@ |
13 MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS@ |
14 |
14 |
15 GLIB_CFLAGS = @GLIB_CFLAGS@ |
15 GLIB_CFLAGS = @GLIB_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 @@ -8093,16 +8093,31 @@ AC_SUBST(QCMS_LIBS) |
34 @@ -8213,16 +8213,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)' |
53 +AC_SUBST(MOZ_ENABLE_NSSHELPER) |
53 +AC_SUBST(MOZ_ENABLE_NSSHELPER) |
54 +AC_SUBST(NSSHELPER_CFLAGS) |
54 +AC_SUBST(NSSHELPER_CFLAGS) |
55 +AC_SUBST(NSSHELPER_LIBS) |
55 +AC_SUBST(NSSHELPER_LIBS) |
56 + |
56 + |
57 +dnl ======================================================== |
57 +dnl ======================================================== |
58 dnl OTS |
58 dnl SIL Graphite |
59 dnl ======================================================== |
59 dnl ======================================================== |
60 MOZ_OTS_LIBS='$(DEPTH)/gfx/ots/src/$(LIB_PREFIX)mozots.$(LIB_SUFFIX)' |
60 if test "$MOZ_GRAPHITE"; then |
61 AC_SUBST(MOZ_OTS_LIBS) |
61 MOZ_GRAPHITE_LIBS='$(DEPTH)/gfx/graphite2/src/$(LIB_PREFIX)mozgraphite2.$(LIB_SUFFIX)' |
62 |
62 AC_DEFINE(MOZ_GRAPHITE) |
63 dnl ======================================================== |
63 else |
64 dnl Skia |
64 MOZ_GRAPHITE_LIBS= |
65 dnl ======================================================== |
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 @@ -114,12 +114,14 @@ CSRCS += md4.c |
69 @@ -118,12 +118,14 @@ EXTRA_DEPS = $(NSS_DEP_LIBS) |
70 |
70 DEFINES += \ |
71 |
71 -DNSS_ENABLE_ECC \ |
72 EXTRA_DEPS = $(NSS_DEP_LIBS) |
72 -DDLL_PREFIX=\"$(DLL_PREFIX)\" \ |
73 |
73 -DDLL_SUFFIX=\"$(DLL_SUFFIX)\" \ |
74 DEFINES += -DNSS_ENABLE_ECC |
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) |
79 +LOCAL_INCLUDES += $(NSS_CFLAGS) $(NSSHELPER_CFLAGS) |
79 +LOCAL_INCLUDES += $(NSS_CFLAGS) $(NSSHELPER_CFLAGS) |
102 +#endif |
102 +#endif |
103 + |
103 + |
104 #include "nsNSSComponent.h" |
104 #include "nsNSSComponent.h" |
105 #include "nsNSSCallbacks.h" |
105 #include "nsNSSCallbacks.h" |
106 #include "nsNSSIOLayer.h" |
106 #include "nsNSSIOLayer.h" |
107 #include "nsSSLThread.h" |
|
108 #include "nsCertVerificationThread.h" |
107 #include "nsCertVerificationThread.h" |
109 |
108 |
110 #include "nsNetUtil.h" |
109 #include "nsNetUtil.h" |
111 #include "nsAppDirectoryServiceDefs.h" |
110 #include "nsAppDirectoryServiceDefs.h" |
112 @@ -1725,18 +1732,34 @@ nsNSSComponent::InitializeNSS(bool showW |
111 #include "nsDirectoryService.h" |
|
112 @@ -1733,18 +1740,34 @@ nsNSSComponent::InitializeNSS(bool showW |
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 @@ -126,17 +126,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO |
152 @@ -471,17 +471,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO |
153 endif |
153 endif |
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) |
160 |
160 |
161 -EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB) |
161 -EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB) |
162 +EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB) $(NSSHELPER_LIBS) |
162 +EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB) $(NSSHELPER_LIBS) |
163 |
163 |
164 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) |
164 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) |
165 CXXFLAGS += $(TK_CFLAGS) |
165 CXXFLAGS += $(TK_CFLAGS) |
166 OS_LIBS += \ |
166 OS_LIBS += \ |
167 -framework SystemConfiguration \ |
167 -framework SystemConfiguration \ |
168 -framework QuickTime \ |
168 -framework QuickTime \ |
169 -framework IOKit \ |
169 -framework IOKit \ |
170 -F/System/Library/PrivateFrameworks -framework CoreUI \ |
170 -F/System/Library/PrivateFrameworks -framework CoreUI \ |