From: Akim Demaille <akim@epita.fr>
Date: Wed, 17 Jan 2001 08:54:52 +0000 (+0000)
Subject: * acgeneral.m4 (_AC_OUTPUT_SUBDIRS): Quote $ac_sub_srcdir in case
X-Git-Tag: autoconf-2.50~256
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6da34540feb0efcd0bca5c724423f81134e31923;p=thirdparty%2Fautoconf.git

* acgeneral.m4 (_AC_OUTPUT_SUBDIRS): Quote $ac_sub_srcdir in case
it has IFS characters.
---

diff --git a/ChangeLog b/ChangeLog
index a28cb4ab9..c785a4445 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-17  Tim Van Holder  <tim.van.holder@pandora.be>
+
+	* acgeneral.m4 (_AC_OUTPUT_SUBDIRS): Quote $ac_sub_srcdir in case
+	it has IFS characters.
+
 2001-01-16  Akim Demaille  <akim@epita.fr>
 
 	Work around the Ultrix limitations on ``multiple redirections''.
diff --git a/acgeneral.m4 b/acgeneral.m4
index 9849c2581..e6922679a 100644
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -4670,9 +4670,9 @@ AC_PROVIDE_IFELSE([AC_PROG_INSTALL],
 
     # Check for guested configure; otherwise get Cygnus style configure.
     if test -f $ac_sub_srcdir/configure.gnu; then
-      ac_sub_configure="$SHELL $ac_sub_srcdir/configure.gnu"
+      ac_sub_configure="$SHELL '$ac_sub_srcdir/configure.gnu'"
     elif test -f $ac_sub_srcdir/configure; then
-      ac_sub_configure="$SHELL $ac_sub_srcdir/configure"
+      ac_sub_configure="$SHELL '$ac_sub_srcdir/configure'"
     elif test -f $ac_sub_srcdir/configure.ac ||
            test -f $ac_sub_srcdir/configure.in; then
       ac_sub_configure=$ac_configure
@@ -4698,11 +4698,9 @@ AC_PROVIDE_IFELSE([AC_PROG_INSTALL],
 
       AC_MSG_NOTICE([running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir])
       # The eval makes quoting arguments work.
-      if eval $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir
-      then :
-      else
+      eval $ac_sub_configure $ac_sub_configure_args \
+           --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir ||
         AC_MSG_ERROR([$ac_sub_configure failed for $ac_subdir])
-      fi
     fi
 
     cd $ac_popdir
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 9849c2581..e6922679a 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -4670,9 +4670,9 @@ AC_PROVIDE_IFELSE([AC_PROG_INSTALL],
 
     # Check for guested configure; otherwise get Cygnus style configure.
     if test -f $ac_sub_srcdir/configure.gnu; then
-      ac_sub_configure="$SHELL $ac_sub_srcdir/configure.gnu"
+      ac_sub_configure="$SHELL '$ac_sub_srcdir/configure.gnu'"
     elif test -f $ac_sub_srcdir/configure; then
-      ac_sub_configure="$SHELL $ac_sub_srcdir/configure"
+      ac_sub_configure="$SHELL '$ac_sub_srcdir/configure'"
     elif test -f $ac_sub_srcdir/configure.ac ||
            test -f $ac_sub_srcdir/configure.in; then
       ac_sub_configure=$ac_configure
@@ -4698,11 +4698,9 @@ AC_PROVIDE_IFELSE([AC_PROG_INSTALL],
 
       AC_MSG_NOTICE([running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir])
       # The eval makes quoting arguments work.
-      if eval $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir
-      then :
-      else
+      eval $ac_sub_configure $ac_sub_configure_args \
+           --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir ||
         AC_MSG_ERROR([$ac_sub_configure failed for $ac_subdir])
-      fi
     fi
 
     cd $ac_popdir