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 @@ -8191,16 +8191,31 @@ AC_SUBST(QCMS_LIBS) |
10 @@ -8303,16 +8303,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)' |
31 +AC_SUBST(NSSHELPER_LIBS) |
31 +AC_SUBST(NSSHELPER_LIBS) |
32 + |
32 + |
33 +dnl ======================================================== |
33 +dnl ======================================================== |
34 dnl SIL Graphite |
34 dnl SIL Graphite |
35 dnl ======================================================== |
35 dnl ======================================================== |
36 if test "$MOZ_GRAPHITE"; then |
36 MOZ_GRAPHITE_LIBS='$(DEPTH)/gfx/graphite2/src/$(LIB_PREFIX)mozgraphite2.$(LIB_SUFFIX)' |
37 MOZ_GRAPHITE_LIBS='$(DEPTH)/gfx/graphite2/src/$(LIB_PREFIX)mozgraphite2.$(LIB_SUFFIX)' |
37 AC_SUBST(MOZ_GRAPHITE_LIBS) |
38 AC_DEFINE(MOZ_GRAPHITE) |
38 |
39 else |
39 dnl ======================================================== |
40 MOZ_GRAPHITE_LIBS= |
40 dnl OTS |
41 fi |
41 dnl ======================================================== |
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 @@ -97,16 +97,19 @@ DEFINES += \ |
45 @@ -93,16 +93,19 @@ DEFINES += \ |
46 |
46 |
47 EXPORTS += \ |
47 EXPORTS += \ |
48 CryptoTask.h \ |
48 CryptoTask.h \ |
49 nsNSSShutDown.h \ |
49 nsNSSShutDown.h \ |
50 ScopedNSSTypes.h \ |
50 ScopedNSSTypes.h \ |
87 #include "nsCertVerificationThread.h" |
87 #include "nsCertVerificationThread.h" |
88 |
88 |
89 #include "nsNetUtil.h" |
89 #include "nsNetUtil.h" |
90 #include "nsAppDirectoryServiceDefs.h" |
90 #include "nsAppDirectoryServiceDefs.h" |
91 #include "nsDirectoryService.h" |
91 #include "nsDirectoryService.h" |
92 @@ -1679,18 +1686,34 @@ nsNSSComponent::InitializeNSS(bool showW |
92 @@ -1682,18 +1689,34 @@ nsNSSComponent::InitializeNSS(bool showW |
93 ConfigureInternalPKCS11Token(); |
93 ConfigureInternalPKCS11Token(); |
94 |
94 |
95 // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs |
95 // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs |
96 // module by NSS_Initialize because we will load it in InstallLoadableRoots |
96 // module by NSS_Initialize because we will load it in InstallLoadableRoots |
97 // later. It also allows us to work around a bug in the system NSS in |
97 // later. It also allows us to work around a bug in the system NSS in |
127 } |
127 } |
128 else { |
128 else { |
129 diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in |
129 diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in |
130 --- a/toolkit/library/Makefile.in |
130 --- a/toolkit/library/Makefile.in |
131 +++ b/toolkit/library/Makefile.in |
131 +++ b/toolkit/library/Makefile.in |
132 @@ -504,17 +504,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO |
132 @@ -501,17 +501,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO |
133 endif |
133 endif |
134 endif |
134 endif |
135 endif |
135 endif |
136 |
136 |
137 EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) |
137 EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) |