equal
deleted
inserted
replaced
5 References: |
5 References: |
6 |
6 |
7 diff --git a/configure.in b/configure.in |
7 diff --git a/configure.in b/configure.in |
8 --- a/configure.in |
8 --- a/configure.in |
9 +++ b/configure.in |
9 +++ b/configure.in |
10 @@ -7987,16 +7987,31 @@ AC_SUBST(QCMS_LIBS) |
10 @@ -8089,16 +8089,31 @@ AC_SUBST(QCMS_LIBS) |
11 |
11 |
12 dnl ======================================================== |
12 dnl ======================================================== |
13 dnl HarfBuzz |
13 dnl HarfBuzz |
14 dnl ======================================================== |
14 dnl ======================================================== |
15 MOZ_HARFBUZZ_LIBS='$(DEPTH)/gfx/harfbuzz/src/$(LIB_PREFIX)mozharfbuzz.$(LIB_SUFFIX)' |
15 MOZ_HARFBUZZ_LIBS='$(DEPTH)/gfx/harfbuzz/src/$(LIB_PREFIX)mozharfbuzz.$(LIB_SUFFIX)' |
40 MOZ_GRAPHITE_LIBS= |
40 MOZ_GRAPHITE_LIBS= |
41 fi |
41 fi |
42 diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in |
42 diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in |
43 --- a/security/manager/ssl/src/Makefile.in |
43 --- a/security/manager/ssl/src/Makefile.in |
44 +++ b/security/manager/ssl/src/Makefile.in |
44 +++ b/security/manager/ssl/src/Makefile.in |
45 @@ -90,12 +90,14 @@ DEFINES += \ |
45 @@ -91,12 +91,14 @@ DEFINES += \ |
46 $(NULL) |
|
47 |
46 |
48 EXPORTS += \ |
47 EXPORTS += \ |
49 nsNSSShutDown.h \ |
48 nsNSSShutDown.h \ |
|
49 ScopedNSSTypes.h \ |
50 $(NULL) |
50 $(NULL) |
51 |
51 |
52 # Use local includes because they are inserted before INCLUDES |
52 # Use local includes because they are inserted before INCLUDES |
53 # so that Mozilla's nss.h is used, not glibc's |
53 # so that Mozilla's nss.h is used, not glibc's |
54 -LOCAL_INCLUDES += $(NSS_CFLAGS) |
54 -LOCAL_INCLUDES += $(NSS_CFLAGS) |
81 #include "nsCertVerificationThread.h" |
81 #include "nsCertVerificationThread.h" |
82 |
82 |
83 #include "nsNetUtil.h" |
83 #include "nsNetUtil.h" |
84 #include "nsAppDirectoryServiceDefs.h" |
84 #include "nsAppDirectoryServiceDefs.h" |
85 #include "nsDirectoryService.h" |
85 #include "nsDirectoryService.h" |
86 @@ -1731,18 +1738,34 @@ nsNSSComponent::InitializeNSS(bool showW |
86 @@ -1730,18 +1737,34 @@ nsNSSComponent::InitializeNSS(bool showW |
87 ConfigureInternalPKCS11Token(); |
87 ConfigureInternalPKCS11Token(); |
88 |
88 |
89 // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs |
89 // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs |
90 // module by NSS_Initialize because we will load it in InstallLoadableRoots |
90 // module by NSS_Initialize because we will load it in InstallLoadableRoots |
91 // later. It also allows us to work around a bug in the system NSS in |
91 // later. It also allows us to work around a bug in the system NSS in |
121 } |
121 } |
122 else { |
122 else { |
123 diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in |
123 diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in |
124 --- a/toolkit/library/Makefile.in |
124 --- a/toolkit/library/Makefile.in |
125 +++ b/toolkit/library/Makefile.in |
125 +++ b/toolkit/library/Makefile.in |
126 @@ -443,17 +443,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO |
126 @@ -484,17 +484,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO |
127 endif |
127 endif |
128 endif |
128 endif |
129 endif |
129 endif |
130 |
130 |
131 EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) |
131 EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) |