Back out Bug 788613 for breaking the build on Windows.
authorKyle Huey <khuey@kylehuey.com>
Mon, 08 Apr 2013 06:22:50 -0700
changeset 128343 61f0e35aab011ea758f88dfdd2af7addcb2f313a
parent 128342 d6ac13733d48c9ba3e213c57833ff4396060a8d6
child 128344 aca8116e7b0b3a9d496e86293155f6717d0c748e
push id270
push userpvanderbeken@mozilla.com
push dateThu, 06 Mar 2014 09:24:21 +0000
bugs788613
milestone23.0a1
Back out Bug 788613 for breaking the build on Windows.
aclocal.m4
build/autoconf/hooks.m4
js/src/aclocal.m4
js/src/build/autoconf/hooks.m4
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,14 +1,13 @@
 dnl
 dnl Local autoconf macros used with mozilla
 dnl The contents of this file are under the Public Domain.
 dnl
 
-builtin(include, build/autoconf/hooks.m4)dnl
 builtin(include, build/autoconf/config.status.m4)dnl
 builtin(include, build/autoconf/toolchain.m4)dnl
 builtin(include, build/autoconf/ccache.m4)dnl
 builtin(include, build/autoconf/nspr.m4)dnl
 builtin(include, build/autoconf/nss.m4)dnl
 builtin(include, build/autoconf/pkg.m4)dnl
 builtin(include, build/autoconf/codeset.m4)dnl
 builtin(include, build/autoconf/altoptions.m4)dnl
deleted file mode 100644
--- a/build/autoconf/hooks.m4
+++ /dev/null
@@ -1,26 +0,0 @@
-dnl This Source Code Form is subject to the terms of the Mozilla Public
-dnl License, v. 2.0. If a copy of the MPL was not distributed with this
-dnl file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-dnl Output the contents of config.log when configure exists with an
-dnl error code.
-define([MOZ_CONFIG_LOG_TRAP],
-[changequote(<<<, >>>)dnl
-trap '[ "$?" != 0 ] && echo "------ config.log ------" && tail -n 25 config.log' EXIT
-changequote([, ])dnl
-])
-
-dnl Wrap AC_INIT_PREPARE to add the above trap.
-define([_MOZ_AC_INIT_PREPARE], defn([AC_INIT_PREPARE]))
-define([AC_INIT_PREPARE],
-[_MOZ_AC_INIT_PREPARE($1)
-MOZ_CONFIG_LOG_TRAP
-])
-
-dnl Disable the trap when running sub-configures.
-define([_MOZ_AC_OUTPUT_SUBDIRS], defn([AC_OUTPUT_SUBDIRS]))
-define([AC_OUTPUT_SUBDIRS],
-[trap '' EXIT
-_MOZ_AC_OUTPUT_SUBDIRS($1)
-MOZ_CONFIG_LOG_TRAP
-])
--- a/js/src/aclocal.m4
+++ b/js/src/aclocal.m4
@@ -1,14 +1,13 @@
 dnl
 dnl Local autoconf macros used with mozilla
 dnl The contents of this file are under the Public Domain.
 dnl
 
-builtin(include, build/autoconf/hooks.m4)dnl
 builtin(include, build/autoconf/config.status.m4)dnl
 builtin(include, build/autoconf/toolchain.m4)dnl
 builtin(include, build/autoconf/ccache.m4)dnl
 builtin(include, build/autoconf/pkg.m4)dnl
 builtin(include, build/autoconf/nspr.m4)dnl
 builtin(include, build/autoconf/altoptions.m4)dnl
 builtin(include, build/autoconf/moznbytetype.m4)dnl
 builtin(include, build/autoconf/mozprog.m4)dnl
deleted file mode 100644
--- a/js/src/build/autoconf/hooks.m4
+++ /dev/null
@@ -1,26 +0,0 @@
-dnl This Source Code Form is subject to the terms of the Mozilla Public
-dnl License, v. 2.0. If a copy of the MPL was not distributed with this
-dnl file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-dnl Output the contents of config.log when configure exists with an
-dnl error code.
-define([MOZ_CONFIG_LOG_TRAP],
-[changequote(<<<, >>>)dnl
-trap '[ "$?" != 0 ] && echo "------ config.log ------" && tail -n 25 config.log' EXIT
-changequote([, ])dnl
-])
-
-dnl Wrap AC_INIT_PREPARE to add the above trap.
-define([_MOZ_AC_INIT_PREPARE], defn([AC_INIT_PREPARE]))
-define([AC_INIT_PREPARE],
-[_MOZ_AC_INIT_PREPARE($1)
-MOZ_CONFIG_LOG_TRAP
-])
-
-dnl Disable the trap when running sub-configures.
-define([_MOZ_AC_OUTPUT_SUBDIRS], defn([AC_OUTPUT_SUBDIRS]))
-define([AC_OUTPUT_SUBDIRS],
-[trap '' EXIT
-_MOZ_AC_OUTPUT_SUBDIRS($1)
-MOZ_CONFIG_LOG_TRAP
-])