summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorStefano Lattarini <stefano.lattarini@gmail.com>2012-06-28 23:29:51 +0200
committerStefano Lattarini <stefano.lattarini@gmail.com>2012-06-28 23:34:53 +0200
commite14ce4482422b56150c483cc896466ce18b6b0f9 (patch)
tree0862a276c00e9c01ce986ec689776152ee8465c1 /configure.ac
parent872113f7803150af12e757515a64aca24cc7d409 (diff)
downloadautomake-e14ce4482422b56150c483cc896466ce18b6b0f9.tar.gz
configure: clump check for ${var%...} and ${var#...} expansion together
And together with those for the ${var%%...} and ${var##...} expansions. After all, it is basically impossible to find a shell that support one of them but not the others. Suggestion by Eric Blake. * configure.ac: Here. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac23
1 files changed, 6 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac
index b79f1e768..c945b13fa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -297,23 +297,12 @@ 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],
- [], [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],
+ [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],