Add mozilla-headless

9 files changed, 1156 insertions, 0 deletions

diff --git a/meta/packages/mozilla-headless/mozilla-headless/arm/jsautocfg.h b/meta/packages/mozilla-headless/mozilla-headless/arm/jsautocfg.h
new file mode 100644
index 0000000000..e9d37dee91
--- /dev/null
+++ b/meta/packages/mozilla-headless/mozilla-headless/arm/jsautocfg.h
@@ -0,0 +1,54 @@
+#ifndef js_cpucfg___
+#define js_cpucfg___
+
+/* AUTOMATICALLY GENERATED - DO NOT EDIT, unless you are an OE dev :) */
+
+#define IS_LITTLE_ENDIAN 1
+#undef  IS_BIG_ENDIAN
+
+#define JS_BYTES_PER_BYTE   1L
+#define JS_BYTES_PER_SHORT  2L
+#define JS_BYTES_PER_INT    4L
+#define JS_BYTES_PER_INT64  8L
+#define JS_BYTES_PER_LONG   4L
+#define JS_BYTES_PER_FLOAT  4L
+#define JS_BYTES_PER_DOUBLE 8L
+#define JS_BYTES_PER_WORD   4L
+#define JS_BYTES_PER_DWORD  8L
+
+#define JS_BITS_PER_BYTE    8L
+#define JS_BITS_PER_SHORT   16L
+#define JS_BITS_PER_INT     32L
+#define JS_BITS_PER_INT64   64L
+#define JS_BITS_PER_LONG    32L
+#define JS_BITS_PER_FLOAT   32L
+#define JS_BITS_PER_DOUBLE  64L
+#define JS_BITS_PER_WORD    32L
+
+#define JS_BITS_PER_BYTE_LOG2   3L
+#define JS_BITS_PER_SHORT_LOG2  4L
+#define JS_BITS_PER_INT_LOG2    5L
+#define JS_BITS_PER_INT64_LOG2  6L
+#define JS_BITS_PER_LONG_LOG2   5L
+#define JS_BITS_PER_FLOAT_LOG2  5L
+#define JS_BITS_PER_DOUBLE_LOG2 6L
+#define JS_BITS_PER_WORD_LOG2   5L
+
+#define JS_ALIGN_OF_SHORT   2L
+#define JS_ALIGN_OF_INT     4L
+#define JS_ALIGN_OF_LONG    4L
+#define JS_ALIGN_OF_INT64   8L
+#define JS_ALIGN_OF_FLOAT   4L
+#define JS_ALIGN_OF_DOUBLE  8L
+#define JS_ALIGN_OF_POINTER 4L
+#define JS_ALIGN_OF_WORD    4L
+
+#define JS_BYTES_PER_WORD_LOG2   2L
+#define JS_BYTES_PER_DWORD_LOG2  3L
+#define JS_WORDS_PER_DWORD_LOG2  1L
+
+#define JS_STACK_GROWTH_DIRECTION (-1)
+
+#define JS_HAVE_LONG_LONG
+
+#endif /* js_cpucfg___ */
diff --git a/meta/packages/mozilla-headless/mozilla-headless/configurefix.patch b/meta/packages/mozilla-headless/mozilla-headless/configurefix.patch
new file mode 100644
index 0000000000..8a5fbbb77f
--- /dev/null
+++ b/meta/packages/mozilla-headless/mozilla-headless/configurefix.patch
@@ -0,0 +1,760 @@
+Index: git/configure.in
+===================================================================
+--- git.orig/configure.in	2009-01-27 16:11:22.000000000 +0000
++++ git/configure.in	2009-01-27 16:16:45.000000000 +0000
+@@ -62,7 +62,6 @@
+ 
+ AC_PREREQ(2.13)
+ AC_INIT(config/config.mk)
+-AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf)
+ AC_CANONICAL_SYSTEM
+ TARGET_CPU="${target_cpu}"
+ TARGET_VENDOR="${target_vendor}"
+@@ -103,7 +102,6 @@
+ _SUBDIR_HOST_CFLAGS="$HOST_CFLAGS"
+ _SUBDIR_HOST_CXXFLAGS="$HOST_CXXFLAGS"
+ _SUBDIR_HOST_LDFLAGS="$HOST_LDFLAGS"
+-_SUBDIR_CONFIG_ARGS="$ac_configure_args"
+ 
+ dnl Set the version number of the libs included with mozilla
+ dnl ========================================================
+@@ -137,6 +135,9 @@
+ 
+ MSMANIFEST_TOOL=
+ 
++ac_cv_have_usable_wchar_v2=no
++ac_cv_have_usable_wchar_option_v2=no
++
+ dnl Set various checks
+ dnl ========================================================
+ MISSING_X=
+@@ -263,7 +264,7 @@
+     ;;
+ esac
+ 
+-if test -n "$CROSS_COMPILE" && test "$target" != "$host"; then
++
+     echo "cross compiling from $host to $target"
+     cross_compiling=yes
+ 
+@@ -301,7 +302,7 @@
+ 
+     AC_MSG_CHECKING([whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works])
+     AC_TRY_COMPILE([], [return(0);], 
+-	[ac_cv_prog_hostcc_works=1 AC_MSG_RESULT([yes])],
++	[ac_cv_prog_hostcc_works=1; AC_MSG_RESULT([yes])],
+ 	AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CC cannot create executables.]) )
+ 
+     CC="$HOST_CXX"
+@@ -309,7 +310,7 @@
+ 
+     AC_MSG_CHECKING([whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works])
+     AC_TRY_COMPILE([], [return(0);], 
+-	[ac_cv_prog_hostcxx_works=1 AC_MSG_RESULT([yes])],
++	[ac_cv_prog_hostcxx_works=1; AC_MSG_RESULT([yes])],
+ 	AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CXX cannot create executables.]) )
+     
+     CC=$_SAVE_CC
+@@ -330,7 +331,7 @@
+         ;;
+     esac
+ 
+-    AC_CHECK_PROGS(CC, $CC "${target_alias}-gcc" "${target}-gcc", :)
++    CC="${target_alias}-gcc"
+     unset ac_cv_prog_CC
+     AC_PROG_CC
+     AC_CHECK_PROGS(CXX, $CXX "${target_alias}-g++" "${target}-g++", :)
+@@ -354,37 +355,7 @@
+     AC_CHECK_PROGS(STRIP, $STRIP "${target_alias}-strip" "${target}-strip", :)
+     AC_CHECK_PROGS(WINDRES, $WINDRES "${target_alias}-windres" "${target}-windres", :)
+     AC_DEFINE(CROSS_COMPILE)
+-else
+-    AC_PROG_CC
+-    AC_PROG_CXX
+-    AC_PROG_RANLIB
+-    AC_PATH_PROGS(AS, $AS as, $CC)
+-    AC_CHECK_PROGS(AR, ar, :)
+-    AC_CHECK_PROGS(LD, ld, :)
+-    AC_CHECK_PROGS(STRIP, strip, :)
+-    AC_CHECK_PROGS(WINDRES, windres, :)
+-    if test -z "$HOST_CC"; then
+-        HOST_CC="$CC"
+-    fi
+-    if test -z "$HOST_CFLAGS"; then
+-        HOST_CFLAGS="$CFLAGS"
+-    fi
+-    if test -z "$HOST_CXX"; then
+-        HOST_CXX="$CXX"
+-    fi
+-    if test -z "$HOST_CXXFLAGS"; then
+-        HOST_CXXFLAGS="$CXXFLAGS"
+-    fi
+-    if test -z "$HOST_LDFLAGS"; then
+-        HOST_LDFLAGS="$LDFLAGS"
+-    fi
+-    if test -z "$HOST_RANLIB"; then
+-        HOST_RANLIB="$RANLIB"
+-    fi
+-    if test -z "$HOST_AR"; then
+-       HOST_AR="$AR"
+-    fi
+-fi
++
+ 
+ GNU_AS=
+ GNU_LD=
+@@ -1467,6 +1438,7 @@
+ '
+ 
+ dnl test that the macros actually work:
++ac_cv_static_assertion_macros_work="yes"
+ AC_MSG_CHECKING(that static assertion macros used in autoconf tests work)
+ AC_CACHE_VAL(ac_cv_static_assertion_macros_work,
+  [AC_LANG_SAVE
+@@ -2625,9 +2597,13 @@
+ AC_LANG_C
+ AC_HEADER_STDC
+ AC_C_CONST
++ac_cv_type_mode_t=yes
+ AC_TYPE_MODE_T
++ac_cv_type_off_t=yes
+ AC_TYPE_OFF_T
++ac_cv_type_pid_t=yes
+ AC_TYPE_PID_T
++ac_cv_type_size_t=yes
+ AC_TYPE_SIZE_T
+ AC_STRUCT_ST_BLKSIZE
+ AC_MSG_CHECKING(for siginfo_t)
+@@ -3009,19 +2985,9 @@
+ dnl We don't want to link against libm or libpthread on Darwin since
+ dnl they both are just symlinks to libSystem and explicitly linking
+ dnl against libSystem causes issues when debugging (see bug 299601).
+-case $target in
+-*-darwin*)
+-    ;;
+-*-beos*)
+-    ;;
+-*)
+     AC_CHECK_LIB(m, atan)
+     AC_CHECK_LIB(dl, dlopen,
+-    AC_CHECK_HEADER(dlfcn.h, 
+-        LIBS="-ldl $LIBS"
+-        AC_DEFINE(HAVE_LIBDL)))
+-    ;;
+-esac
++        AC_DEFINE(HAVE_LIBDL))
+ 
+ _SAVE_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -D_GNU_SOURCE"
+@@ -6763,18 +6729,13 @@
+ 
+ # Demangle only for debug or trace-malloc builds
+ MOZ_DEMANGLE_SYMBOLS=
+-if test "$HAVE_DEMANGLE" -a "$HAVE_GCC3_ABI" && test "$MOZ_DEBUG" -o "$NS_TRACE_MALLOC"; then
+-    MOZ_DEMANGLE_SYMBOLS=1
+-    AC_DEFINE(MOZ_DEMANGLE_SYMBOLS)
+-fi
++
+ AC_SUBST(MOZ_DEMANGLE_SYMBOLS)
+ 
+ dnl ========================================================
+ dnl = Support for gcc stack unwinding (from gcc 3.3)
+ dnl ========================================================
+-if test "$HAVE_GCC3_ABI" && test -z "$SKIP_LIBRARY_CHECKS"; then
+-    AC_CHECK_HEADER(unwind.h, AC_CHECK_FUNCS(_Unwind_Backtrace))
+-fi
++
+ 
+ dnl ========================================================
+ dnl =
+@@ -7288,10 +7249,7 @@
+     dnl if no gtk/libIDL1 or gtk2/libIDL2 combination was found, fall back
+     dnl to either libIDL1 or libIDL2.
+     if test -z "$_LIBIDL_FOUND"; then
+-        AM_PATH_LIBIDL($LIBIDL_VERSION,_LIBIDL_FOUND=1)
+-        if test -z "$_LIBIDL_FOUND"; then
+             PKG_CHECK_MODULES(LIBIDL, libIDL-2.0 >= 0.8.0,_LIBIDL_FOUND=1)
+-        fi
+     fi
+     dnl
+     dnl If we don't have a libIDL config program & not cross-compiling, 
+@@ -7364,11 +7322,7 @@
+ 
+ if test -z "$SKIP_PATH_CHECKS"; then
+ if test -z "${GLIB_CFLAGS}" || test -z "${GLIB_LIBS}" ; then
+-    if test "$MOZ_ENABLE_GTK2" || test "$USE_ELF_DYNSTR_GC" || test "$MOZ_ENABLE_HEADLESS"; then
+         PKG_CHECK_MODULES(GLIB, glib-2.0 >= 1.3.7 gobject-2.0)
+-    else
+-        AM_PATH_GLIB(${GLIB_VERSION})
+-    fi
+ fi
+ fi
+ 
+@@ -8214,10 +8168,7 @@
+ HAVE_WCRTOMB
+ "
+ 
+-AC_CONFIG_HEADER(
+-netwerk/necko-config.h
+-xpcom/xpcom-config.h
+-xpcom/xpcom-private.h
++AC_CONFIG_HEADER(netwerk/necko-config.h xpcom/xpcom-config.h xpcom/xpcom-private.h
+ )
+ 
+ # Save the defines header file before autoconf removes it.
+@@ -8276,28 +8227,9 @@
+ dnl   To add new Makefiles, edit allmakefiles.sh.
+ dnl   allmakefiles.sh sets the variable, MAKEFILES.
+ . ${srcdir}/allmakefiles.sh
+-dnl 
+-dnl Run a perl script to quickly create the makefiles.
+-dnl If it succeeds, it outputs a shell command to set CONFIG_FILES
+-dnl   for the files it cannot handle correctly. This way, config.status
+-dnl   will handle these files.
+-dnl If it fails, nothing is set and config.status will run as usual.
+-dnl
+-dnl This does not change the $MAKEFILES variable.
+-dnl
+-dnl OpenVMS gets a line overflow on the long eval command, so use a temp file.
+-dnl
+-if test -z "${AS_PERL}"; then
+-echo $MAKEFILES | ${PERL} $srcdir/build/autoconf/acoutput-fast.pl > conftest.sh
+-else
+-echo $MAKEFILES | ${PERL} $srcdir/build/autoconf/acoutput-fast.pl -nowrap --cygwin-srcdir=$srcdir > conftest.sh
+-fi
+-. ./conftest.sh
+-rm conftest.sh
+ 
+-echo $MAKEFILES > unallmakefiles
+ 
+-AC_OUTPUT($MAKEFILES)
++echo $MAKEFILES > unallmakefiles
+ 
+ dnl Prevent the regeneration of cairo-features.h forcing rebuilds of gfx stuff
+ if test "$CAIRO_FEATURES_H"; then
+@@ -8323,14 +8255,14 @@
+ HOST_LDFLAGS="$_SUBDIR_HOST_LDFLAGS"
+ RC=
+ 
+-unset MAKEFILES
+-unset CONFIG_FILES
++#unset MAKEFILES
++#unset CONFIG_FILES
+ 
+ # No need to run subconfigures when building with LIBXUL_SDK_DIR
+ if test "$COMPILE_ENVIRONMENT" -a -z "$LIBXUL_SDK_DIR"; then
+ 
+ if test -z "$MOZ_NATIVE_NSPR"; then
+-    ac_configure_args="$_SUBDIR_CONFIG_ARGS --with-dist-prefix=$MOZ_BUILD_ROOT/dist --with-mozilla"
++    ac_configure_args="$ac_configure_args --with-dist-prefix=$MOZ_BUILD_ROOT/dist --with-mozilla"
+     if test -z "$MOZ_DEBUG"; then
+         ac_configure_args="$ac_configure_args --disable-debug"
+     fi
+@@ -8346,8 +8278,7 @@
+     if test -n "$USE_ARM_KUSER"; then
+         ac_configure_args="$ac_configure_args --with-arm-kuser"
+     fi
+-    AC_OUTPUT_SUBDIRS(nsprpub)
+-    ac_configure_args="$_SUBDIR_CONFIG_ARGS"
++    AC_CONFIG_SUBDIRS(nsprpub)
+ fi
+ 
+ if test -z "$MOZ_NATIVE_NSPR"; then
+@@ -8364,7 +8295,6 @@
+ 
+ # Run the SpiderMonkey 'configure' script.
+ dist=$MOZ_BUILD_ROOT/dist
+-ac_configure_args="$_SUBDIR_CONFIG_ARGS"
+ ac_configure_args="$ac_configure_args --enable-threadsafe"
+ if test -z "$MOZ_NATIVE_NSPR"; then
+     ac_configure_args="$ac_configure_args --with-nspr-cflags='$NSPR_CFLAGS'"
+@@ -8378,7 +8308,11 @@
+ if test "$MOZ_MEMORY"; then
+    ac_configure_args="$ac_configure_args --enable-jemalloc"  
+ fi
+-AC_OUTPUT_SUBDIRS(js/src)
+-ac_configure_args="$_SUBDIR_CONFIG_ARGS"
++AC_CONFIG_SUBDIRS(js/src)
+ 
+ fi # COMPILE_ENVIRONMENT && !LIBXUL_SDK_DIR
++
++m4_pattern_allow(AS_BIN)
++
++AC_OUTPUT($MAKEFILES)
++
+Index: git/js/src/configure.in
+===================================================================
+--- git.orig/js/src/configure.in	2009-01-27 16:11:53.000000000 +0000
++++ git/js/src/configure.in	2009-01-27 16:16:45.000000000 +0000
+@@ -62,7 +62,6 @@
+ 
+ AC_PREREQ(2.13)
+ AC_INIT(jsapi.h)
+-AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf)
+ AC_CONFIG_HEADER(js-config.h)
+ AC_CANONICAL_SYSTEM
+ TARGET_CPU="${target_cpu}"
+@@ -101,6 +100,9 @@
+ _SUBDIR_HOST_LDFLAGS="$HOST_LDFLAGS"
+ _SUBDIR_CONFIG_ARGS="$ac_configure_args"
+ 
++ac_cv_have_usable_wchar_v2=no
++ac_cv_have_usable_wchar_option_v2=no
++
+ dnl Set the version number of the libs included with mozilla
+ dnl ========================================================
+ NSPR_VERSION=4
+@@ -114,6 +116,8 @@
+ 
+ MSMANIFEST_TOOL=
+ 
++m4_pattern_allow(AS_BIN)
++
+ dnl Set various checks
+ dnl ========================================================
+ MISSING_X=
+@@ -201,7 +205,7 @@
+ 
+ if test "$COMPILE_ENVIRONMENT"; then
+ 
+-if test "$target" != "$host"; then
++
+     echo "cross compiling from $host to $target"
+ 
+     _SAVE_CC="$CC"
+@@ -238,7 +242,7 @@
+ 
+     AC_MSG_CHECKING([whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works])
+     AC_TRY_COMPILE([], [return(0);], 
+-	[ac_cv_prog_hostcc_works=1 AC_MSG_RESULT([yes])],
++	[ac_cv_prog_hostcc_works=1; AC_MSG_RESULT([yes])],
+ 	AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CC cannot create executables.]) )
+ 
+     CC="$HOST_CXX"
+@@ -246,7 +250,7 @@
+ 
+     AC_MSG_CHECKING([whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works])
+     AC_TRY_COMPILE([], [return(0);], 
+-	[ac_cv_prog_hostcxx_works=1 AC_MSG_RESULT([yes])],
++	[ac_cv_prog_hostcxx_works=1; AC_MSG_RESULT([yes])],
+ 	AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CXX cannot create executables.]) )
+     
+     CC=$_SAVE_CC
+@@ -267,7 +271,7 @@
+         ;;
+     esac
+ 
+-    AC_CHECK_PROGS(CC, $CC "${target_alias}-gcc" "${target}-gcc", :)
++    CC="${target_alias}-gcc"
+     unset ac_cv_prog_CC
+     AC_PROG_CC
+     AC_CHECK_PROGS(CXX, $CXX "${target_alias}-g++" "${target}-g++", :)
+@@ -297,37 +301,6 @@
+     dnl able to run ppc code in a translated environment, making a cross
+     dnl compiler appear native.  So we override that here.
+     cross_compiling=yes
+-else
+-    AC_PROG_CC
+-    AC_PROG_CXX
+-    AC_PROG_RANLIB
+-    AC_PATH_PROGS(AS, $AS as, $CC)
+-    AC_CHECK_PROGS(AR, ar, :)
+-    AC_CHECK_PROGS(LD, ld, :)
+-    AC_CHECK_PROGS(STRIP, strip, :)
+-    AC_CHECK_PROGS(WINDRES, windres, :)
+-    if test -z "$HOST_CC"; then
+-        HOST_CC="$CC"
+-    fi
+-    if test -z "$HOST_CFLAGS"; then
+-        HOST_CFLAGS="$CFLAGS"
+-    fi
+-    if test -z "$HOST_CXX"; then
+-        HOST_CXX="$CXX"
+-    fi
+-    if test -z "$HOST_CXXFLAGS"; then
+-        HOST_CXXFLAGS="$CXXFLAGS"
+-    fi
+-    if test -z "$HOST_LDFLAGS"; then
+-        HOST_LDFLAGS="$LDFLAGS"
+-    fi
+-    if test -z "$HOST_RANLIB"; then
+-        HOST_RANLIB="$RANLIB"
+-    fi
+-    if test -z "$HOST_AR"; then
+-       HOST_AR="$AR"
+-    fi
+-fi
+ 
+ GNU_AS=
+ GNU_LD=
+@@ -1396,6 +1369,8 @@
+ fi # GNU_CC
+ fi # COMPILE_ENVIRONMENT
+ 
++ac_cv_static_assertion_macros_work=yes
++
+ dnl =================================================================
+ dnl Set up and test static assertion macros used to avoid AC_TRY_RUN,
+ dnl which is bad when cross compiling.
+@@ -2524,9 +2499,13 @@
+ AC_LANG_C
+ AC_HEADER_STDC
+ AC_C_CONST
++ac_cv_type_mode_t=yes
+ AC_TYPE_MODE_T
++ac_cv_type_off_t=yes
+ AC_TYPE_OFF_T
++ac_cv_type_pid_t=yes
+ AC_TYPE_PID_T
++ac_cv_type_size_t=yes
+ AC_TYPE_SIZE_T
+ AC_STRUCT_ST_BLKSIZE
+ AC_MSG_CHECKING(for siginfo_t)
+@@ -2551,7 +2530,8 @@
+ 
+ AC_CHECK_HEADER(stdint.h)
+ if test "$ac_cv_header_stdint_h" = yes; then
+-    AC_DEFINE(JS_HAVE_STDINT_H)
++    AC_DEFINE(JS_HAVE_STDINT_H, 1, [have stdint.h])
++    AC_DEFINE(HAVE_STDINT_H)
+ else
+     dnl We'll figure them out for ourselves.  List more likely types
+     dnl earlier.  If we ever really encounter a size for which none of
+@@ -2937,10 +2917,7 @@
+     ;;
+ *)
+     AC_CHECK_LIB(m, atan)
+-    AC_CHECK_LIB(dl, dlopen,
+-    AC_CHECK_HEADER(dlfcn.h, 
+-        LIBS="-ldl $LIBS"
+-        AC_DEFINE(HAVE_LIBDL)))
++    AC_CHECK_LIB(dl, dlopen, AC_DEFINE(HAVE_LIBDL))
+     ;;
+ esac
+ 
+@@ -3839,6 +3816,7 @@
+ [  --with-nspr-libs=LIBS   Pass LIBS to LD when linking code that uses NSPR.
+                           See --with-nspr-cflags for more details.],
+     NSPR_LIBS=$withval)
++$NSPR_LIBS="$NSPR_LIBS -L$(LIBXUL_DIST)/sdk/lib"
+ AC_SUBST(NSPR_CFLAGS)
+ AC_SUBST(NSPR_LIBS)
+ 
+@@ -4467,18 +4445,11 @@
+ 
+ # Demangle only for debug or trace-malloc builds
+ MOZ_DEMANGLE_SYMBOLS=
+-if test "$HAVE_DEMANGLE" -a "$HAVE_GCC3_ABI" && test "$MOZ_DEBUG" -o "$NS_TRACE_MALLOC"; then
+-    MOZ_DEMANGLE_SYMBOLS=1
+-    AC_DEFINE(MOZ_DEMANGLE_SYMBOLS)
+-fi
+ AC_SUBST(MOZ_DEMANGLE_SYMBOLS)
+ 
+ dnl ========================================================
+ dnl = Support for gcc stack unwinding (from gcc 3.3)
+ dnl ========================================================
+-if test "$HAVE_GCC3_ABI" && test -z "$SKIP_LIBRARY_CHECKS"; then
+-    AC_CHECK_HEADER(unwind.h, AC_CHECK_FUNCS(_Unwind_Backtrace))
+-fi
+ 
+ dnl ========================================================
+ dnl =
+@@ -5161,6 +5132,8 @@
+ done
+ AC_SUBST(LIBS_PATH)
+ 
++
++
+ dnl ========================================================
+ dnl JavaScript shell
+ dnl ========================================================
+@@ -5292,3 +5265,4 @@
+ # 'js-config' in Makefile.in.
+ AC_MSG_RESULT(invoking make to create js-config script)
+ $MAKE js-config
++
+Index: git/nsprpub/configure.in
+===================================================================
+--- git.orig/nsprpub/configure.in	2009-01-27 16:12:40.000000000 +0000
++++ git/nsprpub/configure.in	2009-01-27 16:16:45.000000000 +0000
+@@ -42,7 +42,6 @@
+ AC_PREREQ(2.12)
+ AC_INIT(config/libc_r.h)
+ 
+-AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf)
+ AC_CANONICAL_SYSTEM
+ 
+ dnl ========================================================
+@@ -400,7 +399,7 @@
+ dnl ========================================================
+ dnl Checks for compilers.
+ dnl ========================================================
+-if test "$target" != "$host"; then
++
+     echo "cross compiling from $host to $target"
+     cross_compiling=yes
+ 
+@@ -427,7 +426,7 @@
+ 
+     AC_MSG_CHECKING([whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works])
+     AC_TRY_COMPILE([], [return(0);], 
+-        [ac_cv_prog_host_cc_works=1 AC_MSG_RESULT([yes])],
++        [ac_cv_prog_host_cc_works=1; AC_MSG_RESULT([yes])],
+         AC_MSG_ERROR([installation or configuration problem: $host compiler $HOST_CC cannot create executables.]) )
+ 
+     CC=$_SAVE_CC
+@@ -448,7 +447,7 @@
+         ;;        
+     esac            
+ 
+-    AC_CHECK_PROGS(CC, $CC "${target_alias}-gcc" "${target}-gcc", echo)
++    CC="${target_alias}-gcc"
+     unset ac_cv_prog_CC
+     AC_PROG_CC
+     if test -n "$USE_CPLUS"; then
+@@ -474,30 +473,6 @@
+     AC_CHECK_PROGS(STRIP, $STRIP "${target_alias}-strip" "${target}-strip", echo)
+     AC_CHECK_PROGS(WINDRES, $WINDRES "${target_alias}-windres" "${target}-windres", echo)
+ 
+-else
+-    AC_PROG_CC
+-    if test -n "$USE_CPLUS"; then
+-        if test "$CC" = "cl" -a -z "$CXX"; then
+-            CXX=$CC
+-        else        
+-            AC_PROG_CXX
+-        fi
+-    fi
+-    AC_PROG_CPP
+-    AC_PROG_RANLIB
+-    AC_PATH_PROGS(AS, as, $CC)
+-    AC_PATH_PROGS(AR, ar, echo not_ar)
+-    AC_PATH_PROGS(LD, ld link, echo not_ld)
+-    AC_PATH_PROGS(STRIP, strip, echo not_strip)
+-    AC_PATH_PROGS(WINDRES, windres, echo not_windres)
+-    if test -z "$HOST_CC"; then
+-        HOST_CC="$CC"
+-    fi
+-    if test -z "$HOST_CFLAGS"; then
+-        HOST_CFLAGS="$CFLAGS"
+-    fi
+-fi
+-
+ if test "$GCC" = "yes"; then
+     GNU_CC=1
+ fi
+@@ -518,11 +493,8 @@
+         ;;
+ esac
+ 
+-if test "$cross_compiling"  = "yes"; then
++
+     CROSS_COMPILE=1
+-else
+-    CROSS_COMPILE=
+-fi
+ 
+ dnl ========================================================
+ dnl Check for gcc -pipe support
+@@ -2254,10 +2226,7 @@
+ *-darwin*|*-beos*)
+     ;;
+ *)
+-    AC_CHECK_LIB(dl, dlopen,
+-        AC_CHECK_HEADER(dlfcn.h,
+-            OS_LIBS="-ldl $OS_LIBS"))
+-    ;;
++    AC_CHECK_LIB(dl, dlopen)
+ esac
+ 
+ 
+@@ -2874,6 +2843,8 @@
+ dnl pr/tests/w16gui/Makefile
+ dnl tools/Makefile
+ 
++m4_pattern_allow(AS_BIN)
++
+ if test -z "$USE_PTHREADS" && test -z "$USE_BTHREADS"; then
+     MAKEFILES="$MAKEFILES pr/src/threads/combined/Makefile"
+ elif test -n "$USE_PTHREADS"; then
+@@ -2889,3 +2860,5 @@
+ echo $MAKEFILES > unallmakefiles
+ 
+ AC_OUTPUT([$MAKEFILES], [chmod +x config/nspr-config])
++
++
+Index: git/toolkit/toolkit-makefiles.sh
+===================================================================
+--- git.orig/toolkit/toolkit-makefiles.sh	2009-01-27 16:13:11.000000000 +0000
++++ git/toolkit/toolkit-makefiles.sh	2009-01-27 16:16:45.000000000 +0000
+@@ -632,7 +632,6 @@
+   toolkit/crashreporter/client/Makefile
+   toolkit/crashreporter/google-breakpad/src/client/Makefile
+   toolkit/crashreporter/google-breakpad/src/client/mac/handler/Makefile
+-  toolkit/crashreporter/google-breakpad/src/client/windows/Makefile
+   toolkit/crashreporter/google-breakpad/src/client/windows/handler/Makefile
+   toolkit/crashreporter/google-breakpad/src/client/windows/sender/Makefile
+   toolkit/crashreporter/google-breakpad/src/common/Makefile
+Index: git/js/src/Makefile.in
+===================================================================
+--- git.orig/js/src/Makefile.in	2009-01-27 16:11:52.000000000 +0000
++++ git/js/src/Makefile.in	2009-01-27 16:16:45.000000000 +0000
+@@ -513,20 +513,8 @@
+ 
+ export:: jsautocfg.h
+ 
+-ifeq (,$(CROSS_COMPILE)$(filter-out WINNT,$(OS_ARCH)))
+ jsautocfg.h:
+ 	touch $@
+-else
+-ifeq ($(OS_ARCH),WINCE)
+-jsautocfg.h:
+-	touch $@
+-else
+-jsautocfg.h: jscpucfg$(HOST_BIN_SUFFIX)
+-	@rm -f $@ jsautocfg.tmp
+-	./jscpucfg > jsautocfg.tmp
+-	mv jsautocfg.tmp $@
+-endif
+-endif
+ 
+ # jscpucfg is a strange target
+ # Needs to be built with the host compiler but needs to include
+@@ -556,7 +544,7 @@
+ 	echo no need to build jscpucfg $<
+ else
+ jscpucfg$(HOST_BIN_SUFFIX): jscpucfg.cpp Makefile.in
+-	$(HOST_CXX) $(HOST_CXXFLAGS) $(JSCPUCFG_DEFINES) $(DEFINES) $(NSPR_CFLAGS) $(HOST_OUTOPTION)$@ $<
++	$(HOST_CXX) $(HOST_CXXFLAGS) $(JSCPUCFG_DEFINES) $(DEFINES) -I$(DIST)/sdk/include $(NSPR_CFLAGS) $(HOST_OUTOPTION)$@ $<
+ endif
+ endif
+ 
+Index: git/js/src/xpconnect/loader/mozJSComponentLoader.cpp
+===================================================================
+--- git.orig/js/src/xpconnect/loader/mozJSComponentLoader.cpp	2009-01-27 16:11:55.000000000 +0000
++++ git/js/src/xpconnect/loader/mozJSComponentLoader.cpp	2009-01-27 16:16:45.000000000 +0000
+@@ -47,6 +47,8 @@
+ 
+ #include <stdarg.h>
+ 
++#include "mozilla-config.h"
++
+ #include "prlog.h"
+ 
+ #include "nsCOMPtr.h"
+Index: git/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp
+===================================================================
+--- git.orig/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp	2009-01-27 16:11:55.000000000 +0000
++++ git/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp	2009-01-27 16:16:45.000000000 +0000
+@@ -39,6 +39,8 @@
+  *
+  * ***** END LICENSE BLOCK ***** */
+ 
++#include "mozilla-config.h"
++
+ #if !defined(XPCONNECT_STANDALONE) && !defined(NO_SUBSCRIPT_LOADER)
+ 
+ #include "mozJSSubScriptLoader.h"
+Index: git/modules/lcms/include/icc34.h
+===================================================================
+--- git.orig/modules/lcms/include/icc34.h	2009-01-27 16:12:31.000000000 +0000
++++ git/modules/lcms/include/icc34.h	2009-01-27 16:16:45.000000000 +0000
+@@ -144,7 +144,7 @@
+  */
+ 
+ 
+-#ifdef PACKAGE_NAME
++#if 0 
+ /*
+   June 9, 2003, Adapted for use with configure by Bob Friesenhahn
+   Added the stupid check for autoconf by Marti Maria. 
+Index: git/toolkit/mozapps/update/src/updater/Makefile.in
+===================================================================
+--- git.orig/toolkit/mozapps/update/src/updater/Makefile.in	2009-01-27 16:13:09.000000000 +0000
++++ git/toolkit/mozapps/update/src/updater/Makefile.in	2009-01-27 16:16:45.000000000 +0000
+@@ -59,7 +59,7 @@
+ 
+ LIBS += \
+ 	$(DEPTH)/modules/libmar/src/$(LIB_PREFIX)mar.$(LIB_SUFFIX) \
+-	$(BZ2_LIBS) \
++	$(BZ2_LIBS) -lpthread \
+ 	$(NULL)
+ 
+ ifeq ($(OS_ARCH),WINNT)
+Index: git/xpcom/sample/program/Makefile.in
+===================================================================
+--- git.orig/xpcom/sample/program/Makefile.in	2009-01-27 16:13:18.000000000 +0000
++++ git/xpcom/sample/program/Makefile.in	2009-01-27 16:16:45.000000000 +0000
+@@ -57,7 +57,7 @@
+ # that the application be linked against the XPCOM dynamic library or the NSPR
+ # dynamic libraries.
+ LIBS            = \
+-		$(XPCOM_STANDALONE_GLUE_LDOPTS) \
++		$(XPCOM_STANDALONE_GLUE_LDOPTS) -ldl \
+ 		$(NULL)
+ 
+ # Need to link with CoreFoundation on Mac
+Index: git/xpcom/tools/registry/Makefile.in
+===================================================================
+--- git.orig/xpcom/tools/registry/Makefile.in	2009-01-27 16:13:18.000000000 +0000
++++ git/xpcom/tools/registry/Makefile.in	2009-01-27 16:16:45.000000000 +0000
+@@ -54,7 +54,7 @@
+ SIMPLE_PROGRAMS	= $(CPPSRCS:.cpp=$(BIN_SUFFIX))
+ 
+ LIBS            = \
+-		$(XPCOM_STANDALONE_GLUE_LDOPTS) \
++		$(XPCOM_STANDALONE_GLUE_LDOPTS) -ldl \
+ 		$(NULL)
+ 
+ # Need to link with CoreFoundation on Mac
+Index: git/xulrunner/app/Makefile.in
+===================================================================
+--- git.orig/xulrunner/app/Makefile.in	2009-01-27 16:13:19.000000000 +0000
++++ git/xulrunner/app/Makefile.in	2009-01-27 16:16:45.000000000 +0000
+@@ -180,7 +180,7 @@
+ RCFLAGS += -DXULRUNNER_ICO=\"$(DIST)/branding/xulrunner.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\"
+ endif
+ 
+-LIBS += $(JEMALLOC_LIBS)
++LIBS += $(JEMALLOC_LIBS) -lpthread -ldl
+ 
+ include $(topsrcdir)/config/rules.mk
+ 
+Index: git/xulrunner/stub/Makefile.in
+===================================================================
+--- git.orig/xulrunner/stub/Makefile.in	2009-01-27 16:13:20.000000000 +0000
++++ git/xulrunner/stub/Makefile.in	2009-01-27 16:16:45.000000000 +0000
+@@ -101,7 +101,7 @@
+ endif
+ endif
+ 
+-LIBS += $(JEMALLOC_LIBS)
++LIBS += $(JEMALLOC_LIBS) -lpthread -ldl
+ 
+ include $(topsrcdir)/config/rules.mk
+ 
+Index: git/modules/plugin/test/testplugin/Makefile.in
+===================================================================
+--- git.orig/modules/plugin/test/testplugin/Makefile.in	2009-01-27 16:12:37.000000000 +0000
++++ git/modules/plugin/test/testplugin/Makefile.in	2009-01-27 16:16:45.000000000 +0000
+@@ -63,9 +63,7 @@
+ CMMSRCS = nptest_macosx.mm
+ endif
+ 
+-ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
+ CPPSRCS += nptest_gtk2.cpp
+-endif
+ 
+ ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
+ CPPSRCS  += nptest_windows.cpp
+Index: git/xulrunner/installer/libxul-unstable.pc.in
+===================================================================
+--- git.orig/xulrunner/installer/libxul-unstable.pc.in	2009-01-27 18:07:55.000000000 +0000
++++ git/xulrunner/installer/libxul-unstable.pc.in	2009-01-28 15:19:22.000000000 +0000
+@@ -8,5 +8,5 @@
+ Description: The Mozilla Runtime and Embedding Engine (unstable API)
+ Version: %MOZILLA_VERSION%
+ Requires: %NSPR_NAME% >= %NSPR_VERSION%
+-Libs: -L${sdkdir}/lib -lxpcomglue_s -lxul -lxpcom
++Libs: -L${sdkdir}/lib -lxpcomglue_s -lxul -lxpcom -lsmime3 -lnss3 -lssl3 -lnssutil3 -L${sdkdir}/../xulrunner-1.9.2a1pre
+ Cflags: -I${includedir}/${includetype} %WCHAR_CFLAGS%
diff --git a/meta/packages/mozilla-headless/mozilla-headless/i386/jsautocfg.h b/meta/packages/mozilla-headless/mozilla-headless/i386/jsautocfg.h
new file mode 100644
index 0000000000..394271a7ea
--- /dev/null
+++ b/meta/packages/mozilla-headless/mozilla-headless/i386/jsautocfg.h
@@ -0,0 +1,54 @@
+#ifndef js_cpucfg___
+#define js_cpucfg___
+
+/* AUTOMATICALLY GENERATED - DO NOT EDIT */
+
+#define IS_LITTLE_ENDIAN 1
+#undef  IS_BIG_ENDIAN
+
+#define JS_BYTES_PER_BYTE   1L
+#define JS_BYTES_PER_SHORT  2L
+#define JS_BYTES_PER_INT    4L
+#define JS_BYTES_PER_INT64  8L
+#define JS_BYTES_PER_LONG   4L
+#define JS_BYTES_PER_FLOAT  4L
+#define JS_BYTES_PER_DOUBLE 8L
+#define JS_BYTES_PER_WORD   4L
+#define JS_BYTES_PER_DWORD  8L
+
+#define JS_BITS_PER_BYTE    8L
+#define JS_BITS_PER_SHORT   16L
+#define JS_BITS_PER_INT     32L
+#define JS_BITS_PER_INT64   64L
+#define JS_BITS_PER_LONG    32L
+#define JS_BITS_PER_FLOAT   32L
+#define JS_BITS_PER_DOUBLE  64L
+#define JS_BITS_PER_WORD    32L
+
+#define JS_BITS_PER_BYTE_LOG2   3L
+#define JS_BITS_PER_SHORT_LOG2  4L
+#define JS_BITS_PER_INT_LOG2    5L
+#define JS_BITS_PER_INT64_LOG2  6L
+#define JS_BITS_PER_LONG_LOG2   5L
+#define JS_BITS_PER_FLOAT_LOG2  5L
+#define JS_BITS_PER_DOUBLE_LOG2 6L
+#define JS_BITS_PER_WORD_LOG2   5L
+
+#define JS_ALIGN_OF_SHORT   2L
+#define JS_ALIGN_OF_INT     4L
+#define JS_ALIGN_OF_LONG    4L
+#define JS_ALIGN_OF_INT64   4L
+#define JS_ALIGN_OF_FLOAT   4L
+#define JS_ALIGN_OF_DOUBLE  4L
+#define JS_ALIGN_OF_POINTER 4L
+#define JS_ALIGN_OF_WORD    4L
+
+#define JS_BYTES_PER_WORD_LOG2   2L
+#define JS_BYTES_PER_DWORD_LOG2  3L
+#define JS_WORDS_PER_DWORD_LOG2  1L
+
+#define JS_STACK_GROWTH_DIRECTION (-1)
+
+#define JS_HAVE_LONG_LONG
+
+#endif /* js_cpucfg___ */
diff --git a/meta/packages/mozilla-headless/mozilla-headless/i486/jsautocfg.h b/meta/packages/mozilla-headless/mozilla-headless/i486/jsautocfg.h
new file mode 100644
index 0000000000..394271a7ea
--- /dev/null
+++ b/meta/packages/mozilla-headless/mozilla-headless/i486/jsautocfg.h
@@ -0,0 +1,54 @@
+#ifndef js_cpucfg___
+#define js_cpucfg___
+
+/* AUTOMATICALLY GENERATED - DO NOT EDIT */
+
+#define IS_LITTLE_ENDIAN 1
+#undef  IS_BIG_ENDIAN
+
+#define JS_BYTES_PER_BYTE   1L
+#define JS_BYTES_PER_SHORT  2L
+#define JS_BYTES_PER_INT    4L
+#define JS_BYTES_PER_INT64  8L
+#define JS_BYTES_PER_LONG   4L
+#define JS_BYTES_PER_FLOAT  4L
+#define JS_BYTES_PER_DOUBLE 8L
+#define JS_BYTES_PER_WORD   4L
+#define JS_BYTES_PER_DWORD  8L
+
+#define JS_BITS_PER_BYTE    8L
+#define JS_BITS_PER_SHORT   16L
+#define JS_BITS_PER_INT     32L
+#define JS_BITS_PER_INT64   64L
+#define JS_BITS_PER_LONG    32L
+#define JS_BITS_PER_FLOAT   32L
+#define JS_BITS_PER_DOUBLE  64L
+#define JS_BITS_PER_WORD    32L
+
+#define JS_BITS_PER_BYTE_LOG2   3L
+#define JS_BITS_PER_SHORT_LOG2  4L
+#define JS_BITS_PER_INT_LOG2    5L
+#define JS_BITS_PER_INT64_LOG2  6L
+#define JS_BITS_PER_LONG_LOG2   5L
+#define JS_BITS_PER_FLOAT_LOG2  5L
+#define JS_BITS_PER_DOUBLE_LOG2 6L
+#define JS_BITS_PER_WORD_LOG2   5L
+
+#define JS_ALIGN_OF_SHORT   2L
+#define JS_ALIGN_OF_INT     4L
+#define JS_ALIGN_OF_LONG    4L
+#define JS_ALIGN_OF_INT64   4L
+#define JS_ALIGN_OF_FLOAT   4L
+#define JS_ALIGN_OF_DOUBLE  4L
+#define JS_ALIGN_OF_POINTER 4L
+#define JS_ALIGN_OF_WORD    4L
+
+#define JS_BYTES_PER_WORD_LOG2   2L
+#define JS_BYTES_PER_DWORD_LOG2  3L
+#define JS_WORDS_PER_DWORD_LOG2  1L
+
+#define JS_STACK_GROWTH_DIRECTION (-1)
+
+#define JS_HAVE_LONG_LONG
+
+#endif /* js_cpucfg___ */
diff --git a/meta/packages/mozilla-headless/mozilla-headless/i586/jsautocfg.h b/meta/packages/mozilla-headless/mozilla-headless/i586/jsautocfg.h
new file mode 100644
index 0000000000..394271a7ea
--- /dev/null
+++ b/meta/packages/mozilla-headless/mozilla-headless/i586/jsautocfg.h
@@ -0,0 +1,54 @@
+#ifndef js_cpucfg___
+#define js_cpucfg___
+
+/* AUTOMATICALLY GENERATED - DO NOT EDIT */
+
+#define IS_LITTLE_ENDIAN 1
+#undef  IS_BIG_ENDIAN
+
+#define JS_BYTES_PER_BYTE   1L
+#define JS_BYTES_PER_SHORT  2L
+#define JS_BYTES_PER_INT    4L
+#define JS_BYTES_PER_INT64  8L
+#define JS_BYTES_PER_LONG   4L
+#define JS_BYTES_PER_FLOAT  4L
+#define JS_BYTES_PER_DOUBLE 8L
+#define JS_BYTES_PER_WORD   4L
+#define JS_BYTES_PER_DWORD  8L
+
+#define JS_BITS_PER_BYTE    8L
+#define JS_BITS_PER_SHORT   16L
+#define JS_BITS_PER_INT     32L
+#define JS_BITS_PER_INT64   64L
+#define JS_BITS_PER_LONG    32L
+#define JS_BITS_PER_FLOAT   32L
+#define JS_BITS_PER_DOUBLE  64L
+#define JS_BITS_PER_WORD    32L
+
+#define JS_BITS_PER_BYTE_LOG2   3L
+#define JS_BITS_PER_SHORT_LOG2  4L
+#define JS_BITS_PER_INT_LOG2    5L
+#define JS_BITS_PER_INT64_LOG2  6L
+#define JS_BITS_PER_LONG_LOG2   5L
+#define JS_BITS_PER_FLOAT_LOG2  5L
+#define JS_BITS_PER_DOUBLE_LOG2 6L
+#define JS_BITS_PER_WORD_LOG2   5L
+
+#define JS_ALIGN_OF_SHORT   2L
+#define JS_ALIGN_OF_INT     4L
+#define JS_ALIGN_OF_LONG    4L
+#define JS_ALIGN_OF_INT64   4L
+#define JS_ALIGN_OF_FLOAT   4L
+#define JS_ALIGN_OF_DOUBLE  4L
+#define JS_ALIGN_OF_POINTER 4L
+#define JS_ALIGN_OF_WORD    4L
+
+#define JS_BYTES_PER_WORD_LOG2   2L
+#define JS_BYTES_PER_DWORD_LOG2  3L
+#define JS_WORDS_PER_DWORD_LOG2  1L
+
+#define JS_STACK_GROWTH_DIRECTION (-1)
+
+#define JS_HAVE_LONG_LONG
+
+#endif /* js_cpucfg___ */
diff --git a/meta/packages/mozilla-headless/mozilla-headless/i686/jsautocfg.h b/meta/packages/mozilla-headless/mozilla-headless/i686/jsautocfg.h
new file mode 100644
index 0000000000..394271a7ea
--- /dev/null
+++ b/meta/packages/mozilla-headless/mozilla-headless/i686/jsautocfg.h
@@ -0,0 +1,54 @@
+#ifndef js_cpucfg___
+#define js_cpucfg___
+
+/* AUTOMATICALLY GENERATED - DO NOT EDIT */
+
+#define IS_LITTLE_ENDIAN 1
+#undef  IS_BIG_ENDIAN
+
+#define JS_BYTES_PER_BYTE   1L
+#define JS_BYTES_PER_SHORT  2L
+#define JS_BYTES_PER_INT    4L
+#define JS_BYTES_PER_INT64  8L
+#define JS_BYTES_PER_LONG   4L
+#define JS_BYTES_PER_FLOAT  4L
+#define JS_BYTES_PER_DOUBLE 8L
+#define JS_BYTES_PER_WORD   4L
+#define JS_BYTES_PER_DWORD  8L
+
+#define JS_BITS_PER_BYTE    8L
+#define JS_BITS_PER_SHORT   16L
+#define JS_BITS_PER_INT     32L
+#define JS_BITS_PER_INT64   64L
+#define JS_BITS_PER_LONG    32L
+#define JS_BITS_PER_FLOAT   32L
+#define JS_BITS_PER_DOUBLE  64L
+#define JS_BITS_PER_WORD    32L
+
+#define JS_BITS_PER_BYTE_LOG2   3L
+#define JS_BITS_PER_SHORT_LOG2  4L
+#define JS_BITS_PER_INT_LOG2    5L
+#define JS_BITS_PER_INT64_LOG2  6L
+#define JS_BITS_PER_LONG_LOG2   5L
+#define JS_BITS_PER_FLOAT_LOG2  5L
+#define JS_BITS_PER_DOUBLE_LOG2 6L
+#define JS_BITS_PER_WORD_LOG2   5L
+
+#define JS_ALIGN_OF_SHORT   2L
+#define JS_ALIGN_OF_INT     4L
+#define JS_ALIGN_OF_LONG    4L
+#define JS_ALIGN_OF_INT64   4L
+#define JS_ALIGN_OF_FLOAT   4L
+#define JS_ALIGN_OF_DOUBLE  4L
+#define JS_ALIGN_OF_POINTER 4L
+#define JS_ALIGN_OF_WORD    4L
+
+#define JS_BYTES_PER_WORD_LOG2   2L
+#define JS_BYTES_PER_DWORD_LOG2  3L
+#define JS_WORDS_PER_DWORD_LOG2  1L
+
+#define JS_STACK_GROWTH_DIRECTION (-1)
+
+#define JS_HAVE_LONG_LONG
+
+#endif /* js_cpucfg___ */
diff --git a/meta/packages/mozilla-headless/mozilla-headless/mozconfig b/meta/packages/mozilla-headless/mozilla-headless/mozconfig
new file mode 100644
index 0000000000..6123d11d27
--- /dev/null
+++ b/meta/packages/mozilla-headless/mozilla-headless/mozconfig
@@ -0,0 +1,23 @@
+# this line sets the directory for all build output
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../obj-headless-release
+
+# comment out the previous line and uncomment these two for a debug build
+#mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../obj-headless-debug
+#ac_add_options --disable-optimize --enable-debug
+
+# this is the line that enables the headless implementation
+ac_add_options --enable-default-toolkit=cairo-headless
+
+# comment out the previous line and uncomment these two for a GTK build
+#ac_add_options --enable-system-cairo
+#ac_add_options --enable-default-toolkit=cairo-gtk2
+
+ac_add_options --disable-tests
+ac_add_options --disable-javaxpcom
+ac_add_options --enable-application=xulrunner
+ac_add_options --enable-pango
+ac_add_options --disable-printing
+ac_add_options --disable-crashreporter
+ac_add_options --enable-plugins
+ac_add_options --disable-accessibility
+mk_add_options MOZ_CO_PROJECT=xulrunner
diff --git a/meta/packages/mozilla-headless/mozilla-headless/powerpc/jsautocfg.h b/meta/packages/mozilla-headless/mozilla-headless/powerpc/jsautocfg.h
new file mode 100644
index 0000000000..408a5e4ac4
--- /dev/null
+++ b/meta/packages/mozilla-headless/mozilla-headless/powerpc/jsautocfg.h
@@ -0,0 +1,54 @@
+#ifndef js_cpucfg___
+#define js_cpucfg___
+
+/* AUTOMATICALLY GENERATED - DO NOT EDIT */
+
+#undef  IS_LITTLE_ENDIAN
+#define IS_BIG_ENDIAN 1
+
+#define JS_BYTES_PER_BYTE   1L
+#define JS_BYTES_PER_SHORT  2L
+#define JS_BYTES_PER_INT    4L
+#define JS_BYTES_PER_INT64  8L
+#define JS_BYTES_PER_LONG   4L
+#define JS_BYTES_PER_FLOAT  4L
+#define JS_BYTES_PER_DOUBLE 8L
+#define JS_BYTES_PER_WORD   4L
+#define JS_BYTES_PER_DWORD  8L
+
+#define JS_BITS_PER_BYTE    8L
+#define JS_BITS_PER_SHORT   16L
+#define JS_BITS_PER_INT     32L
+#define JS_BITS_PER_INT64   64L
+#define JS_BITS_PER_LONG    32L
+#define JS_BITS_PER_FLOAT   32L
+#define JS_BITS_PER_DOUBLE  64L
+#define JS_BITS_PER_WORD    32L
+
+#define JS_BITS_PER_BYTE_LOG2   3L
+#define JS_BITS_PER_SHORT_LOG2  4L
+#define JS_BITS_PER_INT_LOG2    5L
+#define JS_BITS_PER_INT64_LOG2  6L
+#define JS_BITS_PER_LONG_LOG2   5L
+#define JS_BITS_PER_FLOAT_LOG2  5L
+#define JS_BITS_PER_DOUBLE_LOG2 6L
+#define JS_BITS_PER_WORD_LOG2   5L
+
+#define JS_ALIGN_OF_SHORT   2L
+#define JS_ALIGN_OF_INT     4L
+#define JS_ALIGN_OF_LONG    4L
+#define JS_ALIGN_OF_INT64   8L
+#define JS_ALIGN_OF_FLOAT   4L
+#define JS_ALIGN_OF_DOUBLE  8L
+#define JS_ALIGN_OF_POINTER 4L
+#define JS_ALIGN_OF_WORD    4L
+
+#define JS_BYTES_PER_WORD_LOG2   2L
+#define JS_BYTES_PER_DWORD_LOG2  3L
+#define JS_WORDS_PER_DWORD_LOG2  1L
+
+#define JS_STACK_GROWTH_DIRECTION (-1)
+
+#define JS_HAVE_LONG_LONG
+
+#endif /* js_cpucfg___ */
diff --git a/meta/packages/mozilla-headless/mozilla-headless_git.bb b/meta/packages/mozilla-headless/mozilla-headless_git.bb
new file mode 100644
index 0000000000..9a016ad69b
--- /dev/null
+++ b/meta/packages/mozilla-headless/mozilla-headless_git.bb
@@ -0,0 +1,49 @@
+
+SRC_URI = "git://git.o-hand.com/${PN}.git;protocol=git \
+           file://configurefix.patch;patch=1 \
+           file://jsautocfg.h \
+	   file://mozconfig"
+PV = "0.0+git${SRCREV}"
+PR = "r8"
+
+S = "${WORKDIR}/git"
+
+DEPENDS = "gconf gnome-vfs pango dbus-glib alsa-lib libidl-native sqlite3"
+
+FILES_${PN} += "${libdir}/xulrunner-1.9.2a1pre"
+FILES_${PN}-dev += "${libdir}/xulrunner-devel-1.9.2a1pre"
+FILES_${PN}-dbg += "${libdir}/xulrunner-devel-1.9.2a1pre/sdk/lib/.debug"
+
+inherit autotools_stage mozilla
+
+acpaths = "-I ${S}/build/autoconf "
+
+export topsrcdir = "${S}"
+
+do_configure () {
+	cp ${S}/build/autoconf/install-sh ${S}
+	autotools_do_configure
+	# Yes, we run this twice. The first pass sets up npsrpub-config which then 
+	# sets the values correctly on the second try. Ick.
+	autotools_do_configure
+}
+
+do_compile () {
+	cp ${WORKDIR}/jsautocfg.h ${S}/js/src/
+	#oe_runmake -f client.mk build_all
+	base_do_compile
+}
+
+EXTRA_OECONF =+ "--enable-application=xulrunner --disable-javaxpcom --enable-system-sqlite --enable-default-toolkit=cairo-headless --disable-printing --disable-crashreporter --disable-plugins --disable-accessibility --enable-pango --disable-tests"
+
+export LIBXUL_DIST="${S}/dist"
+
+do_stage_append () {
+	autotools_stage_dir ${STAGE_TEMP}/${libdir}/xulrunner-1.9.2a1pre ${STAGING_DIR_HOST}${layout_libdir}/xulrunner-1.9.2a1pre/
+	autotools_stage_dir ${STAGE_TEMP}/${libdir}/xulrunner-devel-1.9.2a1pre ${STAGING_DIR_HOST}${layout_libdir}/xulrunner-devel-1.9.2a1pre/
+	ln -fs ${STAGING_DIR_HOST}${layout_libdir}/xulrunner-1.9.2a1pre/ /media/build2/builds/poky/build1/moblin/staging/i586-poky-linux/usr/lib/xulrunner-devel-1.9.2a1pre/bin
+	ln -fs ${STAGING_DIR_HOST}${layout_datadir}/xulrunner-1.9.2a1pre/unstable/ /media/build2/builds/poky/build1/moblin/staging/i586-poky-linux/usr/lib/xulrunner-devel-1.9.2a1pre/idl
+	ln -fs ${STAGING_DIR_HOST}${layout_includedir}/xulrunner-1.9.2a1pre/unstable/ /media/build2/builds/poky/build1/moblin/staging/i586-poky-linux/usr/lib/xulrunner-devel-1.9.2a1pre/include
+	ln -fs ${STAGING_DIR_HOST}${layout_libdir}/xulrunner-devel-1.9.2a1pre/sdk/lib/ /media/build2/builds/poky/build1/moblin/staging/i586-poky-linux/usr/lib/xulrunner-devel-1.9.2a1pre/lib
+}
+