Browse Source
* confsubdir.m4: Remove. * override.m4: Apply _AC_ARG_VALIDATE fix to all versions but 2.62.msnyder-reverse-20080609-branch
Paolo Bonzini
19 years ago
3 changed files with 13 additions and 137 deletions
@ -1,127 +0,0 @@ |
|||
dnl Fix Autoconf-2.59 AC_CONFIG_SUBDIRS whitespace mangling, |
|||
dnl by overriding the broken internal Autoconf macro with a |
|||
dnl backport of the 2.60 fix. |
|||
dnl |
|||
dnl This file should be a no-op for Autoconf versions != 2.59. |
|||
dnl It can be removed once the complete tree has moved to a |
|||
dnl newer Autoconf version. |
|||
|
|||
dnl m4_PACKAGE_VERSION is an undocumented Autoconf macro. |
|||
dnl We use it because this fix is intended for 2.59 only. |
|||
dnl A feature test for the broken AC_CONFIG_SUBDIRS instead |
|||
dnl would be better but is tricky. |
|||
dnl |
|||
dnl Use ifdef/ifelse over m4_ifdef/m4_ifelse to be clean for 2.13. |
|||
dnl Redefine AC_CONFIG_SUBDIRS so aclocal pulls in this file |
|||
dnl when needed. |
|||
|
|||
ifdef([m4_PACKAGE_VERSION], |
|||
[ifelse(m4_PACKAGE_VERSION, [2.59], [ |
|||
|
|||
dnl Redefine AC_CONFIG_SUBDIRS so this file is picked up if needed. |
|||
AC_DEFUN([AC_CONFIG_SUBDIRS], defn([AC_CONFIG_SUBDIRS])) |
|||
|
|||
dnl Override the broken macro. |
|||
# _AC_OUTPUT_SUBDIRS |
|||
# ------------------ |
|||
# This is a subroutine of AC_OUTPUT, but it does not go into |
|||
# config.status, rather, it is called after running config.status. |
|||
m4_define([_AC_OUTPUT_SUBDIRS], |
|||
[ |
|||
# |
|||
# CONFIG_SUBDIRS section, as fixed in confsubdir.m4. |
|||
# |
|||
if test "$no_recursion" != yes; then |
|||
|
|||
# Remove --cache-file and --srcdir arguments so they do not pile up. |
|||
ac_sub_configure_args= |
|||
ac_prev= |
|||
eval "set x $ac_configure_args" |
|||
shift |
|||
for ac_arg |
|||
do |
|||
if test -n "$ac_prev"; then |
|||
ac_prev= |
|||
continue |
|||
fi |
|||
case $ac_arg in |
|||
-cache-file | --cache-file | --cache-fil | --cache-fi \ |
|||
| --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) |
|||
ac_prev=cache_file ;; |
|||
-cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ |
|||
| --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \ |
|||
| --c=*) |
|||
;; |
|||
--config-cache | -C) |
|||
;; |
|||
-srcdir | --srcdir | --srcdi | --srcd | --src | --sr) |
|||
ac_prev=srcdir ;; |
|||
-srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) |
|||
;; |
|||
-prefix | --prefix | --prefi | --pref | --pre | --pr | --p) |
|||
ac_prev=prefix ;; |
|||
-prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) |
|||
;; |
|||
*) |
|||
case $ac_arg in |
|||
*\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; |
|||
esac |
|||
ac_sub_configure_args="$ac_sub_configure_args '$ac_arg'" ;; |
|||
esac |
|||
done |
|||
|
|||
# Always prepend --prefix to ensure using the same prefix |
|||
# in subdir configurations. |
|||
ac_arg="--prefix=$prefix" |
|||
case $ac_arg in |
|||
*\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; |
|||
esac |
|||
ac_sub_configure_args="$ac_arg $ac_sub_configure_args" |
|||
|
|||
ac_popdir=`pwd` |
|||
for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue |
|||
|
|||
# Do not complain, so a configure script can configure whichever |
|||
# parts of a large source tree are present. |
|||
test -d "$srcdir/$ac_dir" || continue |
|||
|
|||
AC_MSG_NOTICE([configuring in $ac_dir]) |
|||
AS_MKDIR_P(["$ac_dir"]) |
|||
_AC_SRCPATHS(["$ac_dir"]) |
|||
|
|||
cd "$ac_dir" |
|||
|
|||
# Check for guested configure; otherwise get Cygnus style configure. |
|||
if test -f "$ac_srcdir/configure.gnu"; then |
|||
ac_sub_configure=$ac_srcdir/configure.gnu |
|||
elif test -f "$ac_srcdir/configure"; then |
|||
ac_sub_configure=$ac_srcdir/configure |
|||
elif test -f "$ac_srcdir/configure.in"; then |
|||
# This should be Cygnus configure. |
|||
ac_sub_configure=$ac_aux_dir/configure |
|||
else |
|||
AC_MSG_WARN([no configuration information is in $ac_dir]) |
|||
ac_sub_configure= |
|||
fi |
|||
|
|||
# The recursion is here. |
|||
if test -n "$ac_sub_configure"; then |
|||
# Make the cache file name correct relative to the subdirectory. |
|||
case $cache_file in |
|||
[[\\/]]* | ?:[[\\/]]* ) ac_sub_cache_file=$cache_file ;; |
|||
*) # Relative path. |
|||
ac_sub_cache_file=$ac_top_builddir$cache_file ;; |
|||
esac |
|||
|
|||
AC_MSG_NOTICE([running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir]) |
|||
# The eval makes quoting arguments work. |
|||
eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \ |
|||
--cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" || |
|||
AC_MSG_ERROR([$ac_sub_configure failed for $ac_dir]) |
|||
fi |
|||
|
|||
cd "$ac_popdir" |
|||
done |
|||
fi |
|||
])# _AC_OUTPUT_SUBDIRS |
|||
])]) |
|||
Loading…
Reference in new issue