5 References: |
5 References: |
6 |
6 |
7 diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in |
7 diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in |
8 --- a/config/autoconf.mk.in |
8 --- a/config/autoconf.mk.in |
9 +++ b/config/autoconf.mk.in |
9 +++ b/config/autoconf.mk.in |
10 @@ -560,16 +560,20 @@ MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS |
10 @@ -564,16 +564,20 @@ MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS |
11 |
11 |
12 GLIB_CFLAGS = @GLIB_CFLAGS@ |
12 GLIB_CFLAGS = @GLIB_CFLAGS@ |
13 GLIB_LIBS = @GLIB_LIBS@ |
13 GLIB_LIBS = @GLIB_LIBS@ |
14 GLIB_GMODULE_LIBS = @GLIB_GMODULE_LIBS@ |
14 GLIB_GMODULE_LIBS = @GLIB_GMODULE_LIBS@ |
15 LIBIDL_CFLAGS = @LIBIDL_CFLAGS@ |
15 LIBIDL_CFLAGS = @LIBIDL_CFLAGS@ |
20 +NSSHELPER_CFLAGS = @NSSHELPER_CFLAGS@ |
20 +NSSHELPER_CFLAGS = @NSSHELPER_CFLAGS@ |
21 +NSSHELPER_LIBS = @NSSHELPER_LIBS@ |
21 +NSSHELPER_LIBS = @NSSHELPER_LIBS@ |
22 + |
22 + |
23 MOZ_NATIVE_MAKEDEPEND = @SYSTEM_MAKEDEPEND@ |
23 MOZ_NATIVE_MAKEDEPEND = @SYSTEM_MAKEDEPEND@ |
24 |
24 |
|
25 export CL_INCLUDES_PREFIX = @CL_INCLUDES_PREFIX@ |
|
26 |
25 MOZ_AUTO_DEPS = @MOZ_AUTO_DEPS@ |
27 MOZ_AUTO_DEPS = @MOZ_AUTO_DEPS@ |
26 COMPILER_DEPEND = @COMPILER_DEPEND@ |
28 COMPILER_DEPEND = @COMPILER_DEPEND@ |
27 MDDEPDIR := @MDDEPDIR@ |
29 MDDEPDIR := @MDDEPDIR@ |
28 CC_WRAPPER = @CC_WRAPPER@ |
30 CC_WRAPPER = @CC_WRAPPER@ |
29 CXX_WRAPPER = @CXX_WRAPPER@ |
|
30 |
|
31 diff --git a/configure.in b/configure.in |
31 diff --git a/configure.in b/configure.in |
32 --- a/configure.in |
32 --- a/configure.in |
33 +++ b/configure.in |
33 +++ b/configure.in |
34 @@ -8452,16 +8452,31 @@ AC_SUBST(QCMS_LIBS) |
34 @@ -8550,16 +8550,31 @@ AC_SUBST(QCMS_LIBS) |
35 |
35 |
36 dnl ======================================================== |
36 dnl ======================================================== |
37 dnl HarfBuzz |
37 dnl HarfBuzz |
38 dnl ======================================================== |
38 dnl ======================================================== |
39 MOZ_HARFBUZZ_LIBS='$(DEPTH)/gfx/harfbuzz/src/$(LIB_PREFIX)mozharfbuzz.$(LIB_SUFFIX)' |
39 MOZ_HARFBUZZ_LIBS='$(DEPTH)/gfx/harfbuzz/src/$(LIB_PREFIX)mozharfbuzz.$(LIB_SUFFIX)' |