From 714d0b7a88aeeec4fb13b846102c7c61217680eb Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Mon, 23 Apr 2007 22:52:37 +0000 Subject: 2007-04-23 Ralf Wildenhues gmx.de> * confsubdir.m4 (AC_CONFIG_SUBDIRS, _AC_OUTPUT_SUBDIRS): New file. Override Autoconf-2.59's version of these macros with fixed handling of multiple adjacent whitespace in arguments. * aclocal.m4: Regenerated forcefully. * configure: Ditto. * Makefile.in: Ditto. * libc/*Makefile.in: Ditto. * libc/*aclocal.m4: Ditto. * libc/*configure: Ditto. * libm/*Makefile.in: Ditto. * libm/*aclocal.m4: Ditto. * libm/*configure: Ditto. --- newlib/libm/Makefile.in | 3 ++- newlib/libm/aclocal.m4 | 1 + newlib/libm/common/Makefile.in | 3 ++- newlib/libm/configure | 46 ++++++++++++++++++++++++++--------------- newlib/libm/machine/Makefile.in | 1 + newlib/libm/machine/aclocal.m4 | 1 + newlib/libm/machine/configure | 46 ++++++++++++++++++++++++++--------------- newlib/libm/math/Makefile.in | 3 ++- newlib/libm/mathfp/Makefile.in | 3 ++- 9 files changed, 69 insertions(+), 38 deletions(-) (limited to 'newlib/libm') diff --git a/newlib/libm/Makefile.in b/newlib/libm/Makefile.in index 0fd2522de..84e01dc48 100644 --- a/newlib/libm/Makefile.in +++ b/newlib/libm/Makefile.in @@ -46,7 +46,8 @@ DIST_COMMON = $(srcdir)/../../config.guess $(srcdir)/../../config.sub \ subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../acinclude.m4 \ - $(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.in + $(top_srcdir)/../confsubdir.m4 $(top_srcdir)/../libtool.m4 \ + $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ diff --git a/newlib/libm/aclocal.m4 b/newlib/libm/aclocal.m4 index ac69199fa..c89658a30 100644 --- a/newlib/libm/aclocal.m4 +++ b/newlib/libm/aclocal.m4 @@ -878,4 +878,5 @@ AC_SUBST([am__untar]) ]) # _AM_PROG_TAR m4_include([../acinclude.m4]) +m4_include([../confsubdir.m4]) m4_include([../libtool.m4]) diff --git a/newlib/libm/common/Makefile.in b/newlib/libm/common/Makefile.in index af1a70b2d..2c717042b 100644 --- a/newlib/libm/common/Makefile.in +++ b/newlib/libm/common/Makefile.in @@ -43,7 +43,8 @@ DIST_COMMON = $(srcdir)/../../Makefile.shared $(srcdir)/Makefile.in \ subdir = common ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../acinclude.m4 \ - $(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.in + $(top_srcdir)/../confsubdir.m4 $(top_srcdir)/../libtool.m4 \ + $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs diff --git a/newlib/libm/configure b/newlib/libm/configure index 180a54191..74b7126b0 100755 --- a/newlib/libm/configure +++ b/newlib/libm/configure @@ -6194,14 +6194,17 @@ if test "$no_create" != yes; then fi # -# CONFIG_SUBDIRS section. +# 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= - for ac_arg in $ac_configure_args; do + eval "set x $ac_configure_args" + shift + for ac_arg + do if test -n "$ac_prev"; then ac_prev= continue @@ -6224,20 +6227,28 @@ if test "$no_recursion" != yes; then ac_prev=prefix ;; -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) ;; - *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;; + *) + 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_sub_configure_args="--prefix=$prefix $ac_sub_configure_args" + 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 + test -d "$srcdir/$ac_dir" || continue { echo "$as_me:$LINENO: configuring in $ac_dir" >&5 echo "$as_me: configuring in $ac_dir" >&6;} @@ -6332,15 +6343,16 @@ case $ac_abs_builddir in esac - cd $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="$SHELL '$ac_srcdir/configure.gnu'" - elif test -f $ac_srcdir/configure; then - ac_sub_configure="$SHELL '$ac_srcdir/configure'" - elif test -f $ac_srcdir/configure.in; then - ac_sub_configure=$ac_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 { echo "$as_me:$LINENO: WARNING: no configuration information is in $ac_dir" >&5 echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;} @@ -6356,17 +6368,17 @@ echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;} ac_sub_cache_file=$ac_top_builddir$cache_file ;; esac - { echo "$as_me:$LINENO: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5 -echo "$as_me: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;} + { echo "$as_me:$LINENO: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5 +echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;} # The eval makes quoting arguments work. - eval $ac_sub_configure $ac_sub_configure_args \ - --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir || + eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \ + --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" || { { echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5 echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;} { (exit 1); exit 1; }; } fi - cd $ac_popdir + cd "$ac_popdir" done fi diff --git a/newlib/libm/machine/Makefile.in b/newlib/libm/machine/Makefile.in index fd0a7aa91..444e9ad8a 100644 --- a/newlib/libm/machine/Makefile.in +++ b/newlib/libm/machine/Makefile.in @@ -45,6 +45,7 @@ DIST_COMMON = $(srcdir)/../../../config.guess \ subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../acinclude.m4 \ + $(top_srcdir)/../../confsubdir.m4 \ $(top_srcdir)/../../libtool.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/newlib/libm/machine/aclocal.m4 b/newlib/libm/machine/aclocal.m4 index a8a66b57f..2c75c5405 100644 --- a/newlib/libm/machine/aclocal.m4 +++ b/newlib/libm/machine/aclocal.m4 @@ -878,4 +878,5 @@ AC_SUBST([am__untar]) ]) # _AM_PROG_TAR m4_include([../../acinclude.m4]) +m4_include([../../confsubdir.m4]) m4_include([../../libtool.m4]) diff --git a/newlib/libm/machine/configure b/newlib/libm/machine/configure index b74efc59f..3ddc50808 100755 --- a/newlib/libm/machine/configure +++ b/newlib/libm/machine/configure @@ -6184,14 +6184,17 @@ if test "$no_create" != yes; then fi # -# CONFIG_SUBDIRS section. +# 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= - for ac_arg in $ac_configure_args; do + eval "set x $ac_configure_args" + shift + for ac_arg + do if test -n "$ac_prev"; then ac_prev= continue @@ -6214,20 +6217,28 @@ if test "$no_recursion" != yes; then ac_prev=prefix ;; -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) ;; - *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;; + *) + 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_sub_configure_args="--prefix=$prefix $ac_sub_configure_args" + 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 + test -d "$srcdir/$ac_dir" || continue { echo "$as_me:$LINENO: configuring in $ac_dir" >&5 echo "$as_me: configuring in $ac_dir" >&6;} @@ -6322,15 +6333,16 @@ case $ac_abs_builddir in esac - cd $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="$SHELL '$ac_srcdir/configure.gnu'" - elif test -f $ac_srcdir/configure; then - ac_sub_configure="$SHELL '$ac_srcdir/configure'" - elif test -f $ac_srcdir/configure.in; then - ac_sub_configure=$ac_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 { echo "$as_me:$LINENO: WARNING: no configuration information is in $ac_dir" >&5 echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;} @@ -6346,17 +6358,17 @@ echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;} ac_sub_cache_file=$ac_top_builddir$cache_file ;; esac - { echo "$as_me:$LINENO: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5 -echo "$as_me: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;} + { echo "$as_me:$LINENO: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5 +echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;} # The eval makes quoting arguments work. - eval $ac_sub_configure $ac_sub_configure_args \ - --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir || + eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \ + --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" || { { echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5 echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;} { (exit 1); exit 1; }; } fi - cd $ac_popdir + cd "$ac_popdir" done fi diff --git a/newlib/libm/math/Makefile.in b/newlib/libm/math/Makefile.in index 504667a32..cba8521e6 100644 --- a/newlib/libm/math/Makefile.in +++ b/newlib/libm/math/Makefile.in @@ -43,7 +43,8 @@ DIST_COMMON = $(srcdir)/../../Makefile.shared $(srcdir)/Makefile.in \ subdir = math ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../acinclude.m4 \ - $(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.in + $(top_srcdir)/../confsubdir.m4 $(top_srcdir)/../libtool.m4 \ + $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs diff --git a/newlib/libm/mathfp/Makefile.in b/newlib/libm/mathfp/Makefile.in index f20255b25..0078e8a0b 100644 --- a/newlib/libm/mathfp/Makefile.in +++ b/newlib/libm/mathfp/Makefile.in @@ -43,7 +43,8 @@ DIST_COMMON = $(srcdir)/../../Makefile.shared $(srcdir)/Makefile.in \ subdir = mathfp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../acinclude.m4 \ - $(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.in + $(top_srcdir)/../confsubdir.m4 $(top_srcdir)/../libtool.m4 \ + $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs -- cgit v1.2.3