| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859 |
- --- a/bootstrap
- +++ b/bootstrap
- @@ -244,7 +244,7 @@ check_exists() {
- ($2 --version </dev/null)
- fi
- else
- - ($1 --version </dev/null) >/dev/null 2>&1
- + ($@ --version </dev/null) >/dev/null 2>&1
- fi
-
- test $? -lt 126
- @@ -309,7 +309,7 @@ p
- q'
-
- get_version() {
- - app=$1
- + app="$@"
-
- $app --version >/dev/null 2>&1 || { $app --version; return 1; }
-
- @@ -366,13 +366,13 @@ check_versions() {
- if [ "$req_ver" = "-" ]; then
- # Merely require app to exist; not all prereq apps are well-behaved
- # so we have to rely on $? rather than get_version.
- - if ! check_exists --verbose $app; then
- + if ! check_exists --verbose "$app"; then
- warn_ "Error: '$app' not found"
- ret=1
- fi
- else
- # Require app to produce a new enough version string.
- - inst_ver=$(get_version $app)
- + inst_ver=$(get_version "$app")
- if [ ! "$inst_ver" ]; then
- warn_ "Error: '$app' not found"
- ret=1
- @@ -1205,7 +1205,7 @@ autogen()
- # two just-pre-run programs.
-
- # Import from gettext.
- - with_gettext=yes
- + with_gettext=no
- grep '^[ ]*AM_GNU_GETTEXT_VERSION(' configure.ac >/dev/null || \
- with_gettext=no
-
- --- a/bootstrap.conf
- +++ b/bootstrap.conf
- @@ -354,11 +354,8 @@ gnulib_tool_option_extras="--tests-base=
- buildreq="\
- autoconf 2.64
- automake 1.11.2
- -autopoint 0.19.2
- bison -
- -gettext 0.19.2
- git 1.4.4
- -gperf -
- gzip -
- m4 -
- makeinfo 6.1
|
