test runner: work correctly in VPATH setups

[platform/upstream/automake.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 2b5b057..7d30762 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -297,32 +297,21 @@ AC_DEFUN([_AM_CHECK_CANDIDATE_SHELL],
       [], [am_score=1; break])
 
     _AM_CHECK_SHELL_FEATURE([$1],
-      [supports \${var@%:@glob}],
-      [v=a/b/c; test ${v@%:@*/} = b/c],
+      [supports \${var@%:@glob} and \${var%glob}],
+      [v=a/b/c \
+        && test ${v@%:@*/} = b/c \
+        && test ${v@%:@@%:@*/} = c \
+        && test ${v%/*} = a/b \
+        && test ${v%%/*} = a],
       [], [am_score=1; break])
 
     _AM_CHECK_SHELL_FEATURE([$1],
-      [supports \${var@%:@@%:@glob}],
-      [v=a/b/c; test ${v@%:@@%:@*/} = c],
-      [], [am_score=1; break])
-
-    _AM_CHECK_SHELL_FEATURE([$1],
-      [supports \${var%glob}],
-      [v=a.b.c; test ${v%.*} = a.b],
-      [], [am_score=1; break])
-
-    _AM_CHECK_SHELL_FEATURE([$1],
-      [supports \${var%%glob}],
-      [v=a.b.c; test ${v%%.*} = a],
-      [], [am_score=1; break])
-
-    _AM_CHECK_SHELL_FEATURE([$1],
-      ["set -e" preserves exit traps],
+      [preserves exit traps with "set -e"],
       [set -e; trap 'exit $?' 0; (exit 77); exit 77],
       [], [am_score=1; break])
 
     _AM_CHECK_SHELL_FEATURE([$1],
-      ["set -x" corrupts stderr],
+      [corrupts stderr with "set -x"],
       [(set -x; P=1 true 2>&3) 3>&1 2>/dev/null | grep P=1],
       [am_score=9], [])
 
@@ -334,6 +323,11 @@ AC_DEFUN([_AM_CHECK_CANDIDATE_SHELL],
       [rm -f conftest-alias.sh],
       [rm -f conftest-alias.sh; am_score=1; break])
 
+    _AM_CHECK_SHELL_FEATURE([$1],
+      [supports "test -e"],
+      [test -e config.log && test -e . && test ! -e nonesuch],
+      [], [am_score=1; break])
+
     break
   done])
 
@@ -389,10 +383,6 @@ fi
 AC_ARG_VAR([AM_TEST_RUNNER_SHELL],
            [a sturdy POSIX shell for our testsuite])
 
-## ---------------------- ##
-##  Create output files.  ##
-## ---------------------- ##
-
 
 ###########################################################################
 
@@ -564,6 +554,10 @@ AC_SUBST([EXEEXT])
 
 ###########################################################################
 
+## ---------------------- ##
+##  Create output files.  ##
+## ---------------------- ##
+
 AC_CONFIG_FILES([Makefile])
 
 AC_CONFIG_LINKS([GNUmakefile:GNUmakefile])