aboutsummaryrefslogtreecommitdiffstats
path: root/meta/packages/mozilla-headless/mozilla-headless/configurefix.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages/mozilla-headless/mozilla-headless/configurefix.patch')
-rw-r--r--meta/packages/mozilla-headless/mozilla-headless/configurefix.patch774
1 files changed, 0 insertions, 774 deletions
diff --git a/meta/packages/mozilla-headless/mozilla-headless/configurefix.patch b/meta/packages/mozilla-headless/mozilla-headless/configurefix.patch
deleted file mode 100644
index 7ee1211f1a..0000000000
--- a/meta/packages/mozilla-headless/mozilla-headless/configurefix.patch
+++ /dev/null
@@ -1,774 +0,0 @@
-Index: offscreen/configure.in
-===================================================================
---- offscreen.orig/configure.in 2009-12-09 13:10:12.000000000 +0000
-+++ offscreen/configure.in 2009-12-09 13:38:51.000000000 +0000
-@@ -64,7 +64,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}"
-@@ -106,7 +105,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 ========================================================
-@@ -139,6 +137,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=
-@@ -308,7 +309,7 @@
- ;;
- esac
-
--if test -n "$CROSS_COMPILE" && test "$target" != "$host"; then
-+
- echo "cross compiling from $host to $target"
- cross_compiling=yes
-
-@@ -346,7 +347,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"
-@@ -354,7 +355,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
-@@ -375,7 +376,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++", :)
-@@ -399,37 +400,6 @@
- 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
-- MOZ_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=
-@@ -1586,6 +1556,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
-@@ -2770,9 +2741,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)
-@@ -3174,21 +3149,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*)
-- ;;
--*-os2*)
-- ;;
--*)
- 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"
-@@ -6889,18 +6852,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 =
-@@ -7420,10 +7378,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,
-@@ -7495,13 +7450,7 @@
- fi
-
- 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
-
- if test -z "${GLIB_GMODULE_LIBS}" -a -n "${GLIB_CONFIG}"; then
-@@ -8278,10 +8227,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.
-@@ -8340,31 +8286,11 @@
- 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
-
- mv -f config/autoconf.mk config/autoconf.mk.orig 2> /dev/null
-
--AC_OUTPUT($MAKEFILES)
--
- dnl Prevent the regeneration of cairo-features.h forcing rebuilds of gfx stuff
- if test "$CAIRO_FEATURES_H"; then
- if cmp -s $CAIRO_FEATURES_H "$CAIRO_FEATURES_H".orig; then
-@@ -8390,14 +8316,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
-@@ -8413,8 +8339,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
-@@ -8431,7 +8356,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'"
-@@ -8448,8 +8372,7 @@
- export MOZ_MEMORY_LDFLAGS
- fi
- fi
--AC_OUTPUT_SUBDIRS(js/src)
--ac_configure_args="$_SUBDIR_CONFIG_ARGS"
-+AC_CONFIG_SUBDIRS(js/src)
-
- # Build jsctypes on the platforms we can.
- if test "$BUILD_CTYPES"; then
-@@ -8465,20 +8388,14 @@
- if test -n "$CROSS_COMPILE"; then
- ac_configure_args="$ac_configure_args --build=$build --host=$target"
- fi
-- if test "$SOLARIS_SUNPRO_CC"; then
-- # Always use gcc for libffi on Solaris
-- old_cache_file=$cache_file
-- cache_file=js/ctypes/libffi/config.cache
-- ac_configure_args="$ac_configure_args CC=gcc"
-- AC_OUTPUT_SUBDIRS(js/ctypes/libffi)
-- cache_file=$old_cache_file
-- else
-- AC_OUTPUT_SUBDIRS(js/ctypes/libffi)
-- fi
-- ac_configure_args="$_SUBDIR_CONFIG_ARGS"
-+ AC_CONFIG_SUBDIRS(js/ctypes/libffi)
- fi
- fi
-
-+m4_pattern_allow(AS_BIN)
-+
-+AC_OUTPUT($MAKEFILES)
-+
- fi # COMPILE_ENVIRONMENT && !LIBXUL_SDK_DIR
-
- dnl Prevent the regeneration of autoconf.mk forcing rebuilds of the world
-Index: offscreen/js/src/configure.in
-===================================================================
---- offscreen.orig/js/src/configure.in 2009-12-09 13:10:12.000000000 +0000
-+++ offscreen/js/src/configure.in 2009-12-09 13:38:51.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
-@@ -113,6 +115,8 @@
-
- MSMANIFEST_TOOL=
-
-+m4_pattern_allow(AS_BIN)
-+
- dnl Set various checks
- dnl ========================================================
- MISSING_X=
-@@ -212,7 +216,7 @@
-
- if test "$COMPILE_ENVIRONMENT"; then
-
--if test "$target" != "$host"; then
-+
- echo "cross compiling from $host to $target"
-
- _SAVE_CC="$CC"
-@@ -249,7 +253,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"
-@@ -257,7 +261,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
-@@ -312,7 +316,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++", :)
-@@ -342,37 +346,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
-- MOZ_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=
-@@ -1370,6 +1343,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.
-@@ -2557,9 +2532,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)
-@@ -2584,7 +2563,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
-@@ -2938,10 +2918,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
-
-@@ -3847,6 +3824,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)
-
-@@ -4386,18 +4364,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 =
-@@ -5097,6 +5068,8 @@
-
- AC_HAVE_FUNCS(setlocale)
-
-+
-+
- dnl ========================================================
- dnl Use cygwin wrapper for win32 builds, except MSYS/MinGW
- dnl ========================================================
-@@ -5234,3 +5207,4 @@
- # 'js-config' in Makefile.in.
- AC_MSG_RESULT(invoking make to create js-config script)
- $MAKE js-config
-+
-Index: offscreen/nsprpub/configure.in
-===================================================================
---- offscreen.orig/nsprpub/configure.in 2009-12-09 13:10:12.000000000 +0000
-+++ offscreen/nsprpub/configure.in 2009-12-09 13:10:12.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 ========================================================
-@@ -396,7 +395,7 @@
- dnl ========================================================
- dnl Checks for compilers.
- dnl ========================================================
--if test "$target" != "$host"; then
-+
- echo "cross compiling from $host to $target"
- cross_compiling=yes
-
-@@ -423,7 +422,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
-@@ -444,7 +443,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
-@@ -470,30 +469,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
-@@ -514,11 +489,8 @@
- ;;
- esac
-
--if test "$cross_compiling" = "yes"; then
-+
- CROSS_COMPILE=1
--else
-- CROSS_COMPILE=
--fi
-
- dnl ========================================================
- dnl Check for gcc -pipe support
-@@ -2286,10 +2258,7 @@
- *-darwin*|*-beos*|*-os2*)
- ;;
- *)
-- AC_CHECK_LIB(dl, dlopen,
-- AC_CHECK_HEADER(dlfcn.h,
-- OS_LIBS="-ldl $OS_LIBS"))
-- ;;
-+ AC_CHECK_LIB(dl, dlopen)
- esac
-
-
-@@ -2907,6 +2876,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
-@@ -2922,3 +2893,5 @@
- echo $MAKEFILES > unallmakefiles
-
- AC_OUTPUT([$MAKEFILES], [chmod +x config/nspr-config])
-+
-+
-Index: offscreen/js/src/Makefile.in
-===================================================================
---- offscreen.orig/js/src/Makefile.in 2009-12-09 13:10:12.000000000 +0000
-+++ offscreen/js/src/Makefile.in 2009-12-09 13:10:12.000000000 +0000
-@@ -513,20 +513,8 @@
-
- export:: jsautocfg.h
-
--ifeq (,$(CROSS_COMPILE)$(GNU_CC)$(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: offscreen/js/src/xpconnect/loader/mozJSComponentLoader.cpp
-===================================================================
---- offscreen.orig/js/src/xpconnect/loader/mozJSComponentLoader.cpp 2009-12-09 13:10:12.000000000 +0000
-+++ offscreen/js/src/xpconnect/loader/mozJSComponentLoader.cpp 2009-12-09 13:10:12.000000000 +0000
-@@ -47,6 +47,8 @@
-
- #include <stdarg.h>
-
-+#include "mozilla-config.h"
-+
- #include "prlog.h"
-
- #include "nsCOMPtr.h"
-Index: offscreen/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp
-===================================================================
---- offscreen.orig/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp 2009-12-09 13:10:12.000000000 +0000
-+++ offscreen/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp 2009-12-09 13:10:12.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: offscreen/toolkit/mozapps/update/src/updater/Makefile.in
-===================================================================
---- offscreen.orig/toolkit/mozapps/update/src/updater/Makefile.in 2009-12-09 13:10:12.000000000 +0000
-+++ offscreen/toolkit/mozapps/update/src/updater/Makefile.in 2009-12-09 13:10:12.000000000 +0000
-@@ -56,7 +56,7 @@
-
- LIBS += \
- $(DEPTH)/modules/libmar/src/$(LIB_PREFIX)mar.$(LIB_SUFFIX) \
-- $(BZ2_LIBS) \
-+ $(BZ2_LIBS) -lpthread \
- $(NULL)
-
- ifeq ($(OS_ARCH),WINNT)
-Index: offscreen/xpcom/sample/program/Makefile.in
-===================================================================
---- offscreen.orig/xpcom/sample/program/Makefile.in 2009-12-09 13:10:12.000000000 +0000
-+++ offscreen/xpcom/sample/program/Makefile.in 2009-12-09 13:10:12.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: offscreen/xpcom/tools/registry/Makefile.in
-===================================================================
---- offscreen.orig/xpcom/tools/registry/Makefile.in 2009-12-09 13:10:12.000000000 +0000
-+++ offscreen/xpcom/tools/registry/Makefile.in 2009-12-09 13:10:12.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: offscreen/xulrunner/app/Makefile.in
-===================================================================
---- offscreen.orig/xulrunner/app/Makefile.in 2009-12-09 13:10:12.000000000 +0000
-+++ offscreen/xulrunner/app/Makefile.in 2009-12-09 13:10:12.000000000 +0000
-@@ -173,7 +173,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: offscreen/xulrunner/stub/Makefile.in
-===================================================================
---- offscreen.orig/xulrunner/stub/Makefile.in 2009-12-09 13:10:12.000000000 +0000
-+++ offscreen/xulrunner/stub/Makefile.in 2009-12-09 13:10:12.000000000 +0000
-@@ -100,7 +100,7 @@
- endif
- endif
-
--LIBS += $(JEMALLOC_LIBS)
-+LIBS += $(JEMALLOC_LIBS) -lpthread -ldl
-
- include $(topsrcdir)/config/rules.mk
-
-Index: offscreen/modules/plugin/test/testplugin/Makefile.in
-===================================================================
---- offscreen.orig/modules/plugin/test/testplugin/Makefile.in 2009-12-09 13:10:12.000000000 +0000
-+++ offscreen/modules/plugin/test/testplugin/Makefile.in 2009-12-09 13:10:12.000000000 +0000
-@@ -60,9 +60,7 @@
- CMMSRCS = nptest_macosx.mm
- endif
-
--ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
- CPPSRCS += nptest_gtk2.cpp
--endif
-
- ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
- CPPSRCS += nptest_os2.cpp
-Index: offscreen/js/src/aclocal.m4
-===================================================================
---- offscreen.orig/js/src/aclocal.m4 2009-12-09 13:10:12.000000000 +0000
-+++ offscreen/js/src/aclocal.m4 2009-12-09 13:39:01.000000000 +0000
-@@ -8,6 +8,4 @@
- builtin(include, build/autoconf/altoptions.m4)dnl
- builtin(include, build/autoconf/moznbytetype.m4)dnl
- builtin(include, build/autoconf/mozprog.m4)dnl
--builtin(include, build/autoconf/acwinpaths.m4)dnl
-
--MOZ_PROG_CHECKMSYS()
-Index: offscreen/toolkit/toolkit-makefiles.sh
-===================================================================
---- offscreen.orig/toolkit/toolkit-makefiles.sh 2009-12-09 13:10:12.000000000 +0000
-+++ offscreen/toolkit/toolkit-makefiles.sh 2009-12-09 13:10:12.000000000 +0000
-@@ -369,7 +369,6 @@
- modules/plugin/sdk/samples/Makefile
- modules/plugin/sdk/samples/common/Makefile
- modules/plugin/sdk/samples/basic/windows/Makefile
-- modules/plugin/sdk/samples/basic/unix/Makefile
- modules/plugin/sdk/samples/winless/windows/Makefile
- "
-