1 --- a/build-aux/bootstrap
2 +++ b/build-aux/bootstrap
3 @@ -237,14 +237,14 @@ test -r "$conffile" && . "$conffile"
6 if test "$1" = "--verbose"; then
7 - ($2 --version </dev/null) >/dev/null 2>&1
8 + ($2 $3 $4 --version </dev/null) >/dev/null 2>&1
9 if test $? -ge 126; then
10 # If not found, run with diagnostics as one may be
11 # presented with env variables to set to find the right version
12 - ($2 --version </dev/null)
13 + ($2 $3 $4 --version </dev/null)
16 - ($1 --version </dev/null) >/dev/null 2>&1
17 + ($@ --version </dev/null) >/dev/null 2>&1
28 $app --version >/dev/null 2>&1 || { $app --version; return 1; }
30 @@ -366,13 +366,13 @@ check_versions() {
31 if [ "$req_ver" = "-" ]; then
32 # Merely require app to exist; not all prereq apps are well-behaved
33 # so we have to rely on $? rather than get_version.
34 - if ! check_exists --verbose $app; then
35 + if ! check_exists --verbose "$app"; then
36 warn_ "Error: '$app' not found"
40 # Require app to produce a new enough version string.
41 - inst_ver=$(get_version $app)
42 + inst_ver=$(get_version "$app")
43 if [ ! "$inst_ver" ]; then
44 warn_ "Error: '$app' not found"
46 @@ -1135,7 +1135,7 @@ autogen()
47 # two just-pre-run programs.
49 # Import from gettext.
52 grep '^[ ]*AM_GNU_GETTEXT_VERSION(' configure.ac >/dev/null || \