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 @@ -581,16 +581,20 @@ MOZ_LIBNOTIFY_LIBS = @MOZ_LIBNOTIFY_LIBS |
10 @@ -590,16 +590,20 @@ MOZ_ENABLE_LIBNOTIFY = @MOZ_ENABLE_LIBNO |
11 MOZ_ENABLE_LIBNOTIFY = @MOZ_ENABLE_LIBNOTIFY@ |
|
12 |
11 |
13 MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS@ |
12 MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS@ |
|
13 MOZ_ALSA_CFLAGS = @MOZ_ALSA_CFLAGS@ |
14 |
14 |
15 GLIB_CFLAGS = @GLIB_CFLAGS@ |
15 GLIB_CFLAGS = @GLIB_CFLAGS@ |
16 GLIB_LIBS = @GLIB_LIBS@ |
16 GLIB_LIBS = @GLIB_LIBS@ |
17 GLIB_GMODULE_LIBS = @GLIB_GMODULE_LIBS@ |
17 GLIB_GMODULE_LIBS = @GLIB_GMODULE_LIBS@ |
18 |
18 |
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 @@ -8213,16 +8213,31 @@ AC_SUBST(QCMS_LIBS) |
34 @@ -8180,16 +8180,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 @@ -118,12 +118,14 @@ EXTRA_DEPS = $(NSS_DEP_LIBS) |
69 @@ -119,12 +119,14 @@ EXTRA_DEPS = $(NSS_DEP_LIBS) |
70 DEFINES += \ |
70 DEFINES += \ |
71 -DNSS_ENABLE_ECC \ |
71 -DNSS_ENABLE_ECC \ |
72 -DDLL_PREFIX=\"$(DLL_PREFIX)\" \ |
72 -DDLL_PREFIX=\"$(DLL_PREFIX)\" \ |
73 -DDLL_SUFFIX=\"$(DLL_SUFFIX)\" \ |
73 -DDLL_SUFFIX=\"$(DLL_SUFFIX)\" \ |
74 $(NULL) |
74 $(NULL) |
107 #include "nsCertVerificationThread.h" |
107 #include "nsCertVerificationThread.h" |
108 |
108 |
109 #include "nsNetUtil.h" |
109 #include "nsNetUtil.h" |
110 #include "nsAppDirectoryServiceDefs.h" |
110 #include "nsAppDirectoryServiceDefs.h" |
111 #include "nsDirectoryService.h" |
111 #include "nsDirectoryService.h" |
112 @@ -1733,18 +1740,34 @@ nsNSSComponent::InitializeNSS(bool showW |
112 @@ -1776,18 +1783,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 @@ -471,17 +471,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO |
152 @@ -439,17 +439,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) |