diff options
Diffstat (limited to 'meta-moblin/packages/mozilla-headless/mozilla-headless/autoconffix.patch')
-rw-r--r-- | meta-moblin/packages/mozilla-headless/mozilla-headless/autoconffix.patch | 66 |
1 files changed, 66 insertions, 0 deletions
diff --git a/meta-moblin/packages/mozilla-headless/mozilla-headless/autoconffix.patch b/meta-moblin/packages/mozilla-headless/mozilla-headless/autoconffix.patch new file mode 100644 index 0000000000..2874b0d832 --- /dev/null +++ b/meta-moblin/packages/mozilla-headless/mozilla-headless/autoconffix.patch | |||
@@ -0,0 +1,66 @@ | |||
1 | Fixes to enable building with latest autoconf and automake | ||
2 | |||
3 | RP 2/2/10 | ||
4 | |||
5 | Index: offscreen/js/ctypes/libffi/configure.ac | ||
6 | =================================================================== | ||
7 | --- offscreen.orig/js/ctypes/libffi/configure.ac 2010-02-02 19:53:16.753906134 +0000 | ||
8 | +++ offscreen/js/ctypes/libffi/configure.ac 2010-02-02 19:53:21.895155509 +0000 | ||
9 | @@ -17,10 +17,10 @@ | ||
10 | # the wrong, non-multilib-adjusted value will be used in multilibs. | ||
11 | # As a side effect, we have to subst CFLAGS ourselves. | ||
12 | |||
13 | -m4_rename([_AC_ARG_VAR_PRECIOUS],[real_PRECIOUS]) | ||
14 | +m4_rename_force([_AC_ARG_VAR_PRECIOUS],[real_PRECIOUS]) | ||
15 | m4_define([_AC_ARG_VAR_PRECIOUS],[]) | ||
16 | AC_PROG_CC | ||
17 | -m4_rename([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS]) | ||
18 | +m4_rename_force([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS]) | ||
19 | |||
20 | AC_SUBST(CFLAGS) | ||
21 | |||
22 | Index: offscreen/modules/libpr0n/build/Makefile.in | ||
23 | =================================================================== | ||
24 | --- offscreen.orig/modules/libpr0n/build/Makefile.in 2010-02-02 19:53:16.783906873 +0000 | ||
25 | +++ offscreen/modules/libpr0n/build/Makefile.in 2010-02-02 19:53:21.895155509 +0000 | ||
26 | @@ -92,6 +92,7 @@ | ||
27 | |||
28 | export:: | ||
29 | @{ \ | ||
30 | + \ | ||
31 | $(foreach d,$(filter-out icon,$(MOZ_IMG_DECODERS)), \ | ||
32 | echo "#define IMG_BUILD_DECODER_${d}";) \ | ||
33 | $(foreach d,$(MOZ_IMG_ENCODERS), \ | ||
34 | Index: offscreen/configure.in | ||
35 | =================================================================== | ||
36 | --- offscreen.orig/configure.in 2010-02-02 19:53:28.493904163 +0000 | ||
37 | +++ offscreen/configure.in 2010-02-02 16:33:09.000000000 +0000 | ||
38 | @@ -3250,11 +3250,7 @@ | ||
39 | dnl ======================================================== | ||
40 | AC_CHECK_LIB(Xext, XShmCreateImage, _HAVE_XSHM_XEXT=1,, | ||
41 | $XLIBS $XEXT_LIBS) | ||
42 | - AC_CHECK_HEADER(X11/extensions/XShm.h) | ||
43 | - if test "$ac_cv_header_X11_extensions_XShm_h" = "yes" && | ||
44 | - test -n "$_HAVE_XSHM_XEXT"; then | ||
45 | - AC_DEFINE(HAVE_XSHM) | ||
46 | - fi | ||
47 | + AC_DEFINE(HAVE_XSHM) | ||
48 | |||
49 | dnl ======================================================== | ||
50 | dnl = Check for XIE | ||
51 | @@ -8120,15 +8116,7 @@ | ||
52 | fi # COMPILE_ENVIRONMENT | ||
53 | |||
54 | if test "$USE_FC_FREETYPE"; then | ||
55 | - if test "$COMPILE_ENVIRONMENT"; then | ||
56 | - _SAVE_CPPFLAGS="$CPPFLAGS" | ||
57 | - CPPFLAGS="$CPPFLAGS $FT2_CFLAGS" | ||
58 | - AC_CHECK_HEADERS(fontconfig/fcfreetype.h, , | ||
59 | - [AC_MSG_ERROR(Can't find header fontconfig/fcfreetype.h.)]) | ||
60 | - CPPFLAGS="$_SAVE_CPPFLAGS" | ||
61 | - else | ||
62 | AC_DEFINE(HAVE_FONTCONFIG_FCFREETYPE_H) | ||
63 | - fi | ||
64 | fi | ||
65 | |||
66 | dnl Set various defines and substitutions | ||