diff options
| author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2008-01-30 13:36:35 +0000 |
|---|---|---|
| committer | Paolo Bonzini <bonzini@gcc.gnu.org> | 2008-01-30 13:36:35 +0000 |
| commit | ac9e6043ea006adfa5ad55a2084aeaba5f9f3483 (patch) | |
| tree | 01afb401a947b42dfc0929987cba60f1b078181e | |
| parent | f36a5a8853c2407900cdc21b3a400130aa6f6dda (diff) | |
| download | gcc-ac9e6043ea006adfa5ad55a2084aeaba5f9f3483.zip gcc-ac9e6043ea006adfa5ad55a2084aeaba5f9f3483.tar.gz gcc-ac9e6043ea006adfa5ad55a2084aeaba5f9f3483.tar.bz2 | |
re PR bootstrap/34922 (toplevel ./configure --help is incomplete)
2008-01-30 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
PR bootstrap/34922
* configure.ac (PARSE_ARGS): Push suitable setting of
ac_subdirs_all, for `./configure --help=recursive'.
Handle `+' in generic toplevel directory disabling.
* configure: Regenerate.
From-SVN: r131961
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rwxr-xr-x | configure | 7 | ||||
| -rw-r--r-- | configure.ac | 7 |
3 files changed, 20 insertions, 2 deletions
@@ -1,3 +1,11 @@ +2008-01-30 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + + PR bootstrap/34922 + * configure.ac (PARSE_ARGS): Push suitable setting of + ac_subdirs_all, for `./configure --help=recursive'. + Handle `+' in generic toplevel directory disabling. + * configure: Regenerate. + 2008-01-28 Nick Clifton <nickc@redhat.com> * MAINTAINERS (xstormy16): Take over maintainership. @@ -713,6 +713,8 @@ ac_env_target_alias_set=${target_alias+set} ac_env_target_alias_value=$target_alias ac_cv_env_target_alias_set=${target_alias+set} ac_cv_env_target_alias_value=$target_alias +ac_subdirs_all=`cd $srcdir && echo */configure | sed 's,/configure,,g'` + ac_env_CC_set=${CC+set} ac_env_CC_value=$CC ac_cv_env_CC_set=${CC+set} @@ -1895,6 +1897,8 @@ configdirs=`echo ${host_libs} ${host_tools}` target_configdirs=`echo ${target_libraries} ${target_tools}` build_configdirs=`echo ${build_libs} ${build_tools}` + + ################################################################################ srcname="gnu development package" @@ -4906,7 +4910,8 @@ fi # Handle --disable-<component> generically. for dir in $configdirs $build_configdirs $target_configdirs ; do dirname=`echo $dir | sed -e s/target-//g -e s/build-//g -e s/-/_/g` - if eval test x\${enable_${dirname}} "=" xno ; then + varname=`echo $dirname | sed -e s/+/_/g` + if eval test x\${enable_${varname}} "=" xno ; then noconfigdirs="$noconfigdirs $dir" fi done diff --git a/configure.ac b/configure.ac index e6c8eb0..2cd53dc 100644 --- a/configure.ac +++ b/configure.ac @@ -207,6 +207,10 @@ configdirs=`echo ${host_libs} ${host_tools}` target_configdirs=`echo ${target_libraries} ${target_tools}` build_configdirs=`echo ${build_libs} ${build_tools}` +m4_divert_text([PARSE_ARGS], +[ac_subdirs_all=`cd $srcdir && echo */configure | sed 's,/configure,,g'` +]) + ################################################################################ srcname="gnu development package" @@ -1480,7 +1484,8 @@ fi # Handle --disable-<component> generically. for dir in $configdirs $build_configdirs $target_configdirs ; do dirname=`echo $dir | sed -e s/target-//g -e s/build-//g -e s/-/_/g` - if eval test x\${enable_${dirname}} "=" xno ; then + varname=`echo $dirname | sed -e s/+/_/g` + if eval test x\${enable_${varname}} "=" xno ; then noconfigdirs="$noconfigdirs $dir" fi done |