Mercurial > hg > release > icedtea-1.9

changeset 715:c582a6c71cda cacao

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2007-03-12 Christan Thalinger <twisti@complang.tuwien.ac.at> * Makefile.in: Regenerated after transplanting. * aclocal.m4: Likewise. * configure: Likewise.
author Christian Thalinger <twisti@complang.tuwien.ac.at>
date Wed, 12 Mar 2008 11:05:40 +0100
parents b9e55f0a6994
children 9a0bc3372842
files ChangeLog Makefile.in aclocal.m4 configure
diffstat 4 files changed, 137 insertions(+), 94 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Mar 06 15:53:27 2008 +0000
+++ b/ChangeLog	Wed Mar 12 11:05:40 2008 +0100
@@ -1,3 +1,9 @@
+2007-03-12  Christan Thalinger  <twisti@complang.tuwien.ac.at>
+
+	* Makefile.in: Regenerated after transplanting.
+	* aclocal.m4: Likewise.
+	* configure: Likewise.
+
 2008-03-06  Gary Benson  <gbenson@redhat.com>
 
 	* ports/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp
--- a/Makefile.in	Thu Mar 06 15:53:27 2008 +0000
+++ b/Makefile.in	Wed Mar 12 11:05:40 2008 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -253,16 +253,21 @@
 ICEDTEA_CLS_DIR = \
 	$(abs_top_srcdir)/$(BUILD_OUTPUT_DIR)/classes
 
-ICEDTEA_ENDORSED_DIR = \
-	$(abs_top_srcdir)/bootstrap/jdk1.6.0/lib/endorsed
+ICEDTEA_BOOT_DIR = \
+	$(abs_top_srcdir)/bootstrap/jdk1.6.0
 
-ICEDTEA_ENV =  \
-	"ALT_JDK_IMPORT_PATH=$(abs_top_srcdir)/bootstrap/jdk1.6.0/" \
+ICEDTEA_ENDORSED_DIR = \
+	$(ICEDTEA_BOOT_DIR)/lib/endorsed
+
+@CORE_BUILD_FALSE@ICEDTEA_CORE_BUILD = 
+@CORE_BUILD_TRUE@ICEDTEA_CORE_BUILD = yes
+ICEDTEA_ENV = "ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
 	"ANT_HOME=$(SYSTEM_ANT_DIR)" "BUILD_NUMBER=$(OPENJDK_VERSION)" \
 	"JRE_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" \
-	"HOTSPOT_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" "LANG=C" \
+	"HOTSPOT_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" \
+	"HOTSPOT_VM_DISTRO=\"IcedTea\"" "LANG=C" \
 	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
-	"ALT_BOOTDIR=$(abs_top_srcdir)/bootstrap/jdk1.6.0" \
+	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
 	"ALT_BINARY_PLUGS_PATH=$(abs_top_srcdir)/bootstrap/jdk1.7.0" \
 	"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" "ICEDTEA_RT=$(ICEDTEA_RT)" \
 	"ICEDTEA_BUILD_DIR=$(ICEDTEA_BUILD_DIR)" \
@@ -270,7 +275,10 @@
 	"ICEDTEA_ENDORSED_DIR=$(ICEDTEA_ENDORSED_DIR)" \
 	"ENDORSED=-Djava.endorsed.dirs=$(ICEDTEA_ENDORSED_DIR)" \
 	"CLASSPATH=" "LD_LIBRARY_PATH=" \
-	"FREETYPE2_INC_DIR=$(FREETYPE2_INC_DIR)" $(am__append_1)
+	"ICEDTEA_CORE_BUILD=$(ICEDTEA_CORE_BUILD)" \
+	"LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
+	"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
+	"FT2_LIB=$(FREETYPE2_LIBS)" $(am__append_1)
 
 # OpenJDK ecj build environment.
 ICEDTEA_BUILD_DIR_ECJ = \
@@ -279,13 +287,13 @@
 ICEDTEA_CLS_DIR_ECJ = \
 	$(abs_top_srcdir)/openjdk-ecj/build/$(LINUX_DIR)/classes
 
-ICEDTEA_ENV_ECJ =  \
-	"ALT_JDK_IMPORT_PATH=$(abs_top_srcdir)/bootstrap/jdk1.6.0/" \
+ICEDTEA_ENV_ECJ = "ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
 	"ANT_HOME=$(SYSTEM_ANT_DIR)" "BUILD_NUMBER=$(OPENJDK_VERSION)" \
 	"JRE_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" \
-	"HOTSPOT_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" "LANG=C" \
+	"HOTSPOT_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" \
+	"HOTSPOT_VM_DISTRO=IcedTea" "LANG=C" \
 	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
-	"ALT_BOOTDIR=$(abs_top_srcdir)/bootstrap/jdk1.6.0" \
+	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
 	"ALT_BINARY_PLUGS_PATH=$(abs_top_srcdir)/bootstrap/jdk1.7.0" \
 	"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" "LIBGCJ_JAR=$(LIBGCJ_JAR)" \
 	"ICEDTEA_RT=$(ICEDTEA_RT)" \
@@ -299,7 +307,10 @@
 	"BOOTCLASSPATH_RT_LIBGCJ=-bootclasspath \
 	$(ICEDTEA_RT):$(LIBGCJ_JAR)" "CLASSPATH=" "LD_LIBRARY_PATH=" \
 	"GENSRCDIR=$(abs_top_srcdir)/generated" \
-	"FREETYPE2_INC_DIR=$(FREETYPE2_INC_DIR)" $(am__append_2)
+	"ICEDTEA_CORE_BUILD=$(ICEDTEA_CORE_BUILD)" \
+	"LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
+	"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
+	"FT2_LIB=$(FREETYPE2_LIBS)" $(am__append_2)
 
 # OpenJDK Source Preparation Targets
 # ==================================
@@ -312,13 +323,21 @@
 
 # Patch OpenJDK sources for plug replacements.
 @FAST_BUILD_TRUE@FAST_BUILD_PATCH = patches/icedtea-speed.patch
+@ZERO_BUILD_FALSE@ZERO_BUILD_PATCH = 
+
+# If --enable-zero was passed then patch the build files
+@ZERO_BUILD_TRUE@ZERO_BUILD_PATCH = patches/icedtea-always-zero.patch
+@GCC_OLD_FALSE@GCC_PATCH = patches/icedtea-gcc-4.3.patch
+
+# If new gcc is installed, apply 4.3 patch
+@GCC_OLD_TRUE@GCC_PATCH = 
 ICEDTEA_PATCHES = patches/icedtea-copy-plugs.patch \
 	patches/icedtea-version.patch \
 	patches/icedtea-text-relocations.patch \
 	patches/icedtea-graphics.patch patches/icedtea-paths.patch \
 	patches/icedtea-debuginfo.patch patches/icedtea-ssl.patch \
-	patches/icedtea-license-headers.patch \
-	patches/icedtea-plugin.patch patches/icedtea-rmi_amd64.patch \
+	patches/icedtea-license-headers.patch $(PLUGIN_PATCH) \
+	$(NETX_PATCH) patches/icedtea-rmi_amd64.patch \
 	patches/icedtea-tools.patch patches/icedtea-certbundle.patch \
 	patches/icedtea-demos.patch \
 	patches/icedtea-use-system-tzdata.patch \
@@ -339,11 +358,11 @@
 	patches/icedtea-core-build.patch \
 	patches/icedtea-linker-options.patch \
 	patches/icedtea-ports.patch patches/icedtea-lcms-leak.patch \
-	patches/icedtea-c1-unimplemented.patch \
 	patches/icedtea-timerqueue.patch \
-	patches/icedtea-jnlp-launcher.patch \
 	patches/icedtea-generated.patch patches/icedtea-lib64.patch \
-	$(am__append_3)
+	patches/icedtea-zero.patch patches/icedtea-freetype.patch \
+	$(GCC_PATCH) $(FAST_BUILD_PATCH) $(ZERO_BUILD_PATCH) \
+	$(DISTRIBUTION_PATCHES) $(am__append_3)
 
 # Patch OpenJDK for plug replacements and ecj.
 ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.patch
@@ -474,6 +493,10 @@
 	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
 	$(am__remove_distdir)
 
+dist-lzma: distdir
+	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+	$(am__remove_distdir)
+
 dist-tarZ: distdir
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__remove_distdir)
@@ -500,6 +523,8 @@
 	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+	*.tar.lzma*) \
+	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
@@ -643,17 +668,17 @@
 .MAKE: install-am install-strip
 
 .PHONY: all all-am all-local am--refresh check check-am clean \
-	clean-generic dist dist-all dist-bzip2 dist-gzip dist-shar \
-	dist-tarZ dist-zip distcheck distclean distclean-generic \
-	distclean-local distcleancheck distdir distuninstallcheck dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am
+	clean-generic dist dist-all dist-bzip2 dist-gzip dist-lzma \
+	dist-shar dist-tarZ dist-zip distcheck distclean \
+	distclean-generic distclean-local distcleancheck distdir \
+	distuninstallcheck dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am
 
 
 # Top-Level Targets
@@ -944,39 +969,45 @@
 # you change it in the icedtea-debug target as well.
 icedtea: stamps/bootstrap-directory-symlink.stamp \
 	stamps/hotspot-tools.stamp stamps/plugs.stamp \
-	stamps/ports.stamp stamps/patch.stamp gcjwebplugin.so \
-	stamps/tools.stamp
+	stamps/ports.stamp stamps/patch.stamp $(GCJWEBPLUGIN_TARGET) \
+	$(ICEDTEAPLUGIN_TARGET)
 	$(MAKE) \
 	  $(ICEDTEA_ENV) \
 	  -C openjdk/ j2se_only
-	if test "$(ENABLE_PLUGIN)" == "yes" ; \
-	  then \
-	  cp -pPRf gcjwebplugin.so \
-	    $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) ; \
-	  cp -pPRf gcjwebplugin.so \
-	    $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) ; \
-	fi
-	$(FASTJAR) uf $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/tools.jar \
-	  -C lib/tools .
+@ENABLE_LIVECONNECT_TRUE@	cp -pPRf IcedTeaPlugin.so \
+@ENABLE_LIVECONNECT_TRUE@	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
+@ENABLE_LIVECONNECT_TRUE@	cp -pPRf IcedTeaPlugin.so \
+@ENABLE_LIVECONNECT_TRUE@	  $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
+@ENABLE_LIVECONNECT_FALSE@@ENABLE_PLUGIN_TRUE@	cp -pPRf gcjwebplugin.so \
+@ENABLE_LIVECONNECT_FALSE@@ENABLE_PLUGIN_TRUE@	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
+@ENABLE_LIVECONNECT_FALSE@@ENABLE_PLUGIN_TRUE@	cp -pPRf gcjwebplugin.so \
+@ENABLE_LIVECONNECT_FALSE@@ENABLE_PLUGIN_TRUE@	  $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
+	cp rt/net/sourceforge/jnlp/resources/default.jnlp \
+	  $(BUILD_OUTPUT_DIR)/j2re-image/lib
+	cp rt/net/sourceforge/jnlp/resources/default.jnlp \
+	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib
 	@echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)
 
 icedtea-debug: stamps/bootstrap-directory-symlink.stamp \
 	stamps/hotspot-tools.stamp stamps/plugs.stamp \
-	stamps/ports.stamp stamps/patch.stamp gcjwebplugin.so \
-	stamps/tools.stamp
+	stamps/ports.stamp stamps/patch.stamp $(GCJWEBPLUGIN_TARGET) \
+	$(ICEDTEAPLUGIN_TARGET)
 	$(MAKE) \
 	  $(ICEDTEA_ENV) \
 	  -C openjdk/ \
 	  j2se_fastdebug_only
-	if test "$(ENABLE_PLUGIN)" == "yes" ; \
-	  then \
-	  cp -pPRf gcjwebplugin.so \
-	    $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) ; \
-	  cp -pPRf gcjwebplugin.so \
-	    $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR) ; \
-	fi
-	$(FASTJAR) uf $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/lib/tools.jar \
-	  -C lib/tools .
+@ENABLE_LIVECONNECT_TRUE@	cp -pPRf IcedTeaPlugin.so \
+@ENABLE_LIVECONNECT_TRUE@	  $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
+@ENABLE_LIVECONNECT_TRUE@	cp -pPRf IcedTeaPlugin.so \
+@ENABLE_LIVECONNECT_TRUE@	  $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR)
+@ENABLE_LIVECONNECT_FALSE@@ENABLE_PLUGIN_TRUE@	cp -pPRf gcjwebplugin.so \
+@ENABLE_LIVECONNECT_FALSE@@ENABLE_PLUGIN_TRUE@	  $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
+@ENABLE_LIVECONNECT_FALSE@@ENABLE_PLUGIN_TRUE@	cp -pPRf gcjwebplugin.so \
+@ENABLE_LIVECONNECT_FALSE@@ENABLE_PLUGIN_TRUE@	  $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR)
+	cp rt/net/sourceforge/jnlp/resources/default.jnlp \
+	  $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib
+	cp rt/net/sourceforge/jnlp/resources/default.jnlp \
+	  $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib
 	@echo "IcedTea (debug build) is served:" \
 	  $(BUILD_OUTPUT_DIR)-debug
 
@@ -997,7 +1028,7 @@
 	stamps/ports-ecj.stamp stamps/patch-ecj.stamp
 	$(MAKE) \
 	  $(ICEDTEA_ENV_ECJ) \
-	  -C openjdk-ecj/
+	  -C openjdk-ecj/ j2se_only
 	@echo "ecj-poured IcedTea is served:" \
 	  openjdk-ecj/build/$(LINUX_DIR)
 	mkdir -p stamps
--- a/aclocal.m4	Thu Mar 06 15:53:27 2008 +0000
+++ b/aclocal.m4	Wed Mar 12 11:05:40 2008 +0100
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -11,10 +11,13 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-m4_if(m4_PACKAGE_VERSION, [2.61],,
-[m4_fatal([this file was generated for autoconf 2.61.
-You have another version of autoconf.  If you want to use that,
-you should regenerate the build system entirely.], [63])])
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(AC_AUTOCONF_VERSION, [2.61],,
+[m4_warning([this file was generated for autoconf 2.61.
+You have another version of autoconf.  It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
 
 # pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
 # 
@@ -164,7 +167,7 @@
 
 _PKG_TEXT
 
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
 		[$4])
 else
 	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
@@ -174,7 +177,7 @@
 fi[]dnl
 ])# PKG_CHECK_MODULES
 
-# Copyright (C) 2002, 2003, 2005, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -189,7 +192,7 @@
 [am__api_version='1.10'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.10], [],
+m4_if([$1], [1.10.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -205,8 +208,10 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10])dnl
-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
+[AM_AUTOMAKE_VERSION([1.10.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
@@ -478,7 +483,7 @@
   # each Makefile.in and add a new line on top of each file to say so.
   # Grep'ing the whole file is not good either: AIX grep has a line
   # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
     dirpart=`AS_DIRNAME("$mf")`
   else
     continue
@@ -526,13 +531,13 @@
 # Do all the work for Automake.                             -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# 2005, 2006, 2008 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 12
+# serial 13
 
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
@@ -637,16 +642,17 @@
 # our stamp files there.
 AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
 [# Compute $1's index in $config_headers.
+_am_arg=$1
 _am_stamp_count=1
 for _am_header in $config_headers :; do
   case $_am_header in
-    $1 | $1:* )
+    $_am_arg | $_am_arg:* )
       break ;;
     * )
       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
   esac
 done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
 # Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
 #
@@ -935,7 +941,7 @@
 
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
 # This macro is traced by Automake.
 AC_DEFUN([_AM_SUBST_NOTMAKE])
 
--- a/configure	Thu Mar 06 15:53:27 2008 +0000
+++ b/configure	Wed Mar 12 11:05:40 2008 +0100
@@ -9509,22 +9509,22 @@
 and XULRUNNER_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details." >&5
 echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
-Alternatively, you may set the environment variables GLIB_CFLAGS
-and GLIB_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables XULRUNNER_CFLAGS
+and XULRUNNER_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 else
-	GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS
-	GLIB_LIBS=$pkg_cv_GLIB_LIBS
+	XULRUNNER_CFLAGS=$pkg_cv_XULRUNNER_CFLAGS
+	XULRUNNER_LIBS=$pkg_cv_XULRUNNER_LIBS
         { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
 	:
@@ -9620,7 +9620,7 @@
 and GTK_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details." >&5
 echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -9630,7 +9630,7 @@
 and GTK_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 else
@@ -10713,6 +10713,20 @@
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${FAST_BUILD_TRUE}" && test -z "${FAST_BUILD_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"FAST_BUILD\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"FAST_BUILD\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${ZERO_BUILD_TRUE}" && test -z "${ZERO_BUILD_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"ZERO_BUILD\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"ZERO_BUILD\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${ZERO_BUILD_TRUE}" && test -z "${ZERO_BUILD_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"ZERO_BUILD\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -10734,13 +10748,6 @@
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
-if test -z "${ZERO_BUILD_TRUE}" && test -z "${ZERO_BUILD_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"ZERO_BUILD\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"ZERO_BUILD\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
 if test -z "${CORE_BUILD_TRUE}" && test -z "${CORE_BUILD_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"CORE_BUILD\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -10762,13 +10769,6 @@
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
-if test -z "${FAST_BUILD_TRUE}" && test -z "${FAST_BUILD_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"FAST_BUILD\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"FAST_BUILD\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
 
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
@@ -11503,7 +11503,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 74; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 77; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -11825,7 +11825,7 @@
   # each Makefile.in and add a new line on top of each file to say so.
   # Grep'ing the whole file is not good either: AIX grep has a line
   # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
     dirpart=`$as_dirname -- "$mf" ||
 $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$mf" : 'X\(//\)[^/]' \| \