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 @@ -579,16 +579,20 @@ MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS |
10 @@ -577,16 +577,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 @@ -8625,16 +8625,31 @@ AC_SUBST(QCMS_LIBS) |
34 @@ -8680,16 +8680,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)' |
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 @@ -1761,18 +1768,34 @@ nsNSSComponent::InitializeNSS(PRBool sho |
112 @@ -1748,18 +1755,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 |
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 -lcrypto \ |
170 -F/System/Library/PrivateFrameworks -framework CoreUI \ |