diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rwxr-xr-x | configure | 7 | ||||
| -rw-r--r-- | configure.ac | 7 |
3 files changed, 20 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 23f21fda5e6..20197124760 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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-23 Ben Elliston <bje@au.ibm.com> * config.sub, config.guess: Update from upstream sources. diff --git a/configure b/configure index 18648c77693..4cdcd0a3454 100755 --- a/configure +++ b/configure @@ -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 e6c8eb045c3..2cd53dc7df9 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 |