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 @@ -8296,16 +8296,31 @@ if test "$MOZ_ENABLE_SKIA"; then |
10 @@ -8309,16 +8309,31 @@ if test "$MOZ_ENABLE_SKIA"; then |
11 MOZ_ENABLE_SKIA_GPU=1 |
|
12 AC_DEFINE(USE_SKIA_GPU) |
11 AC_DEFINE(USE_SKIA_GPU) |
13 AC_SUBST(MOZ_ENABLE_SKIA_GPU) |
12 AC_SUBST(MOZ_ENABLE_SKIA_GPU) |
14 fi |
13 fi |
15 fi |
14 fi |
16 AC_SUBST(MOZ_ENABLE_SKIA) |
15 AC_SUBST(MOZ_ENABLE_SKIA) |
|
16 AC_SUBST_LIST(SKIA_INCLUDES) |
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 + |
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 @@ -203,16 +203,18 @@ if CONFIG['MOZ_B2G_CAMERA'] and CONFIG[' |
125 @@ -205,16 +205,18 @@ if CONFIG['MOZ_B2G_CAMERA'] and CONFIG[' |
126 'stagefright_omx', |
126 'stagefright_omx', |
127 ] |
127 ] |
128 |
128 |
129 if CONFIG['OS_ARCH'] == 'Linux' and CONFIG['OS_TARGET'] != 'Android': |
129 if CONFIG['OS_ARCH'] == 'Linux' and CONFIG['OS_TARGET'] != 'Android': |
130 OS_LIBS += [ |
130 OS_LIBS += [ |