2 Wolfgang Rosenauer <wr@rosenauer.org> |
2 Wolfgang Rosenauer <wr@rosenauer.org> |
3 Subject: use libnsssharedhelper if available at compile time |
3 Subject: use libnsssharedhelper if available at compile time |
4 (can be disabled by exporting MOZ_XRE_NO_NSSHELPER=1) |
4 (can be disabled by exporting MOZ_XRE_NO_NSSHELPER=1) |
5 References: |
5 References: |
6 |
6 |
7 diff --git a/configure.in b/configure.in |
7 diff --git a/old-configure.in b/old-configure.in |
8 --- a/configure.in |
8 --- a/old-configure.in |
9 +++ b/configure.in |
9 +++ b/old-configure.in |
10 @@ -8310,16 +8310,31 @@ if test "$MOZ_ENABLE_SKIA"; then |
10 @@ -8187,16 +8187,31 @@ if test "$MOZ_ENABLE_SKIA"; then |
11 AC_DEFINE(USE_SKIA_GPU) |
11 AC_DEFINE(USE_SKIA_GPU) |
12 AC_SUBST(MOZ_ENABLE_SKIA_GPU) |
12 AC_SUBST(MOZ_ENABLE_SKIA_GPU) |
13 fi |
13 fi |
14 fi |
14 fi |
15 AC_SUBST(MOZ_ENABLE_SKIA) |
15 AC_SUBST(MOZ_ENABLE_SKIA) |
85 #include "NSSCertDBTrustDomain.h" |
85 #include "NSSCertDBTrustDomain.h" |
86 #include "SharedSSLState.h" |
86 #include "SharedSSLState.h" |
87 #include "mozilla/Preferences.h" |
87 #include "mozilla/Preferences.h" |
88 #include "mozilla/PublicSSL.h" |
88 #include "mozilla/PublicSSL.h" |
89 #include "mozilla/Services.h" |
89 #include "mozilla/Services.h" |
90 @@ -1007,17 +1014,31 @@ nsNSSComponent::InitializeNSS() |
90 @@ -1017,17 +1024,31 @@ nsNSSComponent::InitializeNSS() |
91 return rv; |
91 return rv; |
92 } |
92 } |
93 } |
93 } |
94 MOZ_LOG(gPIPNSSLog, LogLevel::Debug, ("inSafeMode: %u\n", inSafeMode)); |
94 MOZ_LOG(gPIPNSSLog, LogLevel::Debug, ("inSafeMode: %u\n", inSafeMode)); |
95 |
95 |
120 MOZ_LOG(gPIPNSSLog, LogLevel::Debug, ("could not init in r/o either\n")); |
120 MOZ_LOG(gPIPNSSLog, LogLevel::Debug, ("could not init in r/o either\n")); |
121 } |
121 } |
122 diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build |
122 diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build |
123 --- a/toolkit/library/moz.build |
123 --- a/toolkit/library/moz.build |
124 +++ b/toolkit/library/moz.build |
124 +++ b/toolkit/library/moz.build |
125 @@ -205,16 +205,18 @@ if CONFIG['MOZ_B2G_CAMERA'] and CONFIG[' |
125 @@ -209,16 +209,18 @@ if CONFIG['OS_ARCH'] == 'Linux' and CONF |
126 'stagefright_omx', |
|
127 ] |
|
128 |
|
129 if CONFIG['OS_ARCH'] == 'Linux' and CONFIG['OS_TARGET'] != 'Android': |
|
130 OS_LIBS += [ |
126 OS_LIBS += [ |
131 'rt', |
127 'rt', |
132 ] |
128 ] |
133 |
129 |
|
130 OS_LIBS += CONFIG['MOZ_CAIRO_OSLIBS'] |
|
131 OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS'] |
|
132 OS_LIBS += CONFIG['MOZ_SERVO_LIBS'] |
|
133 |
134 +OS_LIBS += sorted(CONFIG['NSSHELPER_LIBS']) |
134 +OS_LIBS += sorted(CONFIG['NSSHELPER_LIBS']) |
135 + |
135 + |
136 OS_LIBS += CONFIG['MOZ_CAIRO_OSLIBS'] |
|
137 OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS'] |
|
138 |
|
139 if CONFIG['MOZ_NATIVE_JPEG']: |
136 if CONFIG['MOZ_NATIVE_JPEG']: |
140 OS_LIBS += CONFIG['MOZ_JPEG_LIBS'] |
137 OS_LIBS += CONFIG['MOZ_JPEG_LIBS'] |
141 |
138 |
142 if CONFIG['MOZ_NATIVE_PNG']: |
139 if CONFIG['MOZ_NATIVE_PNG']: |
143 OS_LIBS += CONFIG['MOZ_PNG_LIBS'] |
140 OS_LIBS += CONFIG['MOZ_PNG_LIBS'] |
|
141 |
|
142 if CONFIG['MOZ_NATIVE_HUNSPELL']: |
|
143 OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS'] |