diff --git a/aclocal.m4 b/aclocal.m4 index 4d967cbf27d9..52398cf6224c 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -3,7 +3,6 @@ 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 diff --git a/build/autoconf/hooks.m4 b/build/autoconf/hooks.m4 deleted file mode 100644 index 17176bbc40bc..000000000000 --- 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 -]) diff --git a/js/src/aclocal.m4 b/js/src/aclocal.m4 index f2f94aa8f75e..afa827187503 100644 --- a/js/src/aclocal.m4 +++ b/js/src/aclocal.m4 @@ -3,7 +3,6 @@ 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 diff --git a/js/src/build/autoconf/hooks.m4 b/js/src/build/autoconf/hooks.m4 deleted file mode 100644 index 17176bbc40bc..000000000000 --- 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 -])