mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
2b54a872d5
All subconfigures are essentially doing it already, so just inverse the process. That would also limit problems with additional subconfigures (all the recent ones had to come with their own config.cache)
68 lines
2.1 KiB
Plaintext
68 lines
2.1 KiB
Plaintext
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 exits 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(GEN_MOZ_AC_OUTPUT_SUBDIRS, [
|
|
define([_MOZ_AC_OUTPUT_SUBDIRS], [
|
|
patsubst($@, [$srcdir/$ac_config_dir], [$srcdir/$moz_config_srcdir])
|
|
])
|
|
])
|
|
GEN_MOZ_AC_OUTPUT_SUBDIRS(defn([AC_OUTPUT_SUBDIRS]))
|
|
|
|
define([AC_OUTPUT_SUBDIRS],
|
|
[trap '' EXIT
|
|
for moz_config_dir in $1; do
|
|
case "$moz_config_dir" in
|
|
*:*)
|
|
moz_config_srcdir=$(echo $moz_config_dir | awk -F: '{print [$]1}')
|
|
moz_config_dir=$(echo $moz_config_dir | awk -F: '{print [$]2}')
|
|
;;
|
|
*)
|
|
moz_config_srcdir=$moz_config_dir
|
|
;;
|
|
esac
|
|
_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
|
|
case "$host" in
|
|
*-mingw*)
|
|
_CONFIG_SHELL=$(cd $(dirname $_CONFIG_SHELL); pwd -W)/$(basename $_CONFIG_SHELL)
|
|
if test ! -e "$_CONFIG_SHELL" -a -e "${_CONFIG_SHELL}.exe"; then
|
|
_CONFIG_SHELL="${_CONFIG_SHELL}.exe"
|
|
fi
|
|
;;
|
|
esac
|
|
|
|
if test -d "$moz_config_dir"; then
|
|
(cd "$moz_config_dir"; $PYTHON $_topsrcdir/build/subconfigure.py dump "$_CONFIG_SHELL")
|
|
else
|
|
mkdir -p "$moz_config_dir"
|
|
fi
|
|
_save_cache_file="$cache_file"
|
|
ifelse($2,,cache_file="$moz_config_dir/config.cache",cache_file="$2")
|
|
_MOZ_AC_OUTPUT_SUBDIRS($moz_config_dir)
|
|
cache_file="$_save_cache_file"
|
|
(cd "$moz_config_dir"; $PYTHON $_topsrcdir/build/subconfigure.py adjust $ac_sub_configure)
|
|
done
|
|
|
|
MOZ_CONFIG_LOG_TRAP
|
|
])
|
|
|
|
dnl Print error messages in config.log as well as stderr
|
|
define([AC_MSG_ERROR],
|
|
[{ echo "configure: error: $1" 1>&2; echo "configure: error: $1" 1>&5; exit 1; }])
|