5 References: |
5 References: |
6 |
6 |
7 diff --git a/old-configure.in b/old-configure.in |
7 diff --git a/old-configure.in b/old-configure.in |
8 --- a/old-configure.in |
8 --- a/old-configure.in |
9 +++ b/old-configure.in |
9 +++ b/old-configure.in |
10 @@ -6495,16 +6495,31 @@ if test "$MOZ_ENABLE_SKIA"; then |
10 @@ -5358,16 +5358,31 @@ esac |
11 AC_DEFINE(USE_SKIA_GPU) |
11 |
12 AC_SUBST(MOZ_ENABLE_SKIA_GPU) |
12 AC_SUBST(MOZ_TREE_CAIRO) |
13 fi |
13 AC_SUBST_LIST(MOZ_CAIRO_CFLAGS) |
14 fi |
14 AC_SUBST_LIST(MOZ_CAIRO_LIBS) |
15 AC_SUBST(MOZ_ENABLE_SKIA) |
15 AC_SUBST_LIST(MOZ_CAIRO_OSLIBS) |
16 AC_SUBST_LIST(SKIA_INCLUDES) |
16 AC_SUBST(MOZ_TREE_PIXMAN) |
17 |
17 |
18 dnl ======================================================== |
18 dnl ======================================================== |
19 +dnl Check for nss-shared-helper |
19 +dnl Check for nss-shared-helper |
20 +dnl ======================================================== |
20 +dnl ======================================================== |
21 + |
21 + |
40 AC_DEFINE(MOZ_XUL) |
40 AC_DEFINE(MOZ_XUL) |
41 else |
41 else |
42 diff --git a/security/manager/ssl/moz.build b/security/manager/ssl/moz.build |
42 diff --git a/security/manager/ssl/moz.build b/security/manager/ssl/moz.build |
43 --- a/security/manager/ssl/moz.build |
43 --- a/security/manager/ssl/moz.build |
44 +++ b/security/manager/ssl/moz.build |
44 +++ b/security/manager/ssl/moz.build |
45 @@ -159,16 +159,19 @@ if CONFIG['MOZ_XUL']: |
45 @@ -160,16 +160,19 @@ if CONFIG['MOZ_XUL']: |
46 ] |
46 ] |
47 |
47 |
48 UNIFIED_SOURCES += [ |
48 UNIFIED_SOURCES += [ |
49 'md4.c', |
49 'md4.c', |
50 ] |
50 ] |
85 #include "NSSCertDBTrustDomain.h" |
85 #include "NSSCertDBTrustDomain.h" |
86 #include "ScopedNSSTypes.h" |
86 #include "ScopedNSSTypes.h" |
87 #include "SharedSSLState.h" |
87 #include "SharedSSLState.h" |
88 #include "cert.h" |
88 #include "cert.h" |
89 #include "certdb.h" |
89 #include "certdb.h" |
90 @@ -1491,17 +1498,31 @@ nsNSSComponent::InitializeNSS() |
90 @@ -1702,17 +1709,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 @@ -209,16 +209,18 @@ if CONFIG['OS_ARCH'] == 'Linux' and CONF |
125 @@ -220,16 +220,18 @@ OS_LIBS += CONFIG['MOZ_CAIRO_OSLIBS'] |
126 OS_LIBS += [ |
126 OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS'] |
127 'rt', |
|
128 ] |
|
129 |
127 |
130 OS_LIBS += CONFIG['MOZ_CAIRO_OSLIBS'] |
128 if CONFIG['SERVO_TARGET_DIR']: |
131 OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS'] |
129 if CONFIG['_MSC_VER']: |
132 OS_LIBS += CONFIG['MOZ_SERVO_LIBS'] |
130 OS_LIBS += ['%s/geckoservo' % CONFIG['SERVO_TARGET_DIR']] |
|
131 else: |
|
132 OS_LIBS += ['-L%s' % CONFIG['SERVO_TARGET_DIR'], '-lgeckoservo'] |
133 |
133 |
134 +OS_LIBS += sorted(CONFIG['NSSHELPER_LIBS']) |
134 +OS_LIBS += sorted(CONFIG['NSSHELPER_LIBS']) |
135 + |
135 + |
136 if CONFIG['MOZ_SYSTEM_JPEG']: |
136 if CONFIG['MOZ_SYSTEM_JPEG']: |
137 OS_LIBS += CONFIG['MOZ_JPEG_LIBS'] |
137 OS_LIBS += CONFIG['MOZ_JPEG_LIBS'] |