diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2017-01-12 15:04:38 -0800 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-01-12 15:08:15 -0800 |
commit | 70d6f2d14f87ab8fe164e1d461b7a55ed1ca3c62 (patch) | |
tree | 45360c60d254451d16faa8d478a8bd08fd4e70f0 /autogen.sh | |
parent | 3713c7a0621f4a5ae73e45c6d0d5c55b154611ad (diff) | |
download | emacs-70d6f2d14f87ab8fe164e1d461b7a55ed1ca3c62.tar.gz |
Restore behavior of ‘./autogen.sh autoconf git’
* autogen.sh: Do both autoconf and git setup when invoked
as ‘./autogen.sh autoconf git’. Avoid unnecessary newline in chatter.
Mention new --no-check option in usage message. (Bug#25359)
Diffstat (limited to 'autogen.sh')
-rwxr-xr-x | autogen.sh | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/autogen.sh b/autogen.sh index cb2a9151afe..bb3f8185f79 100755 --- a/autogen.sh +++ b/autogen.sh @@ -104,27 +104,32 @@ check_version () } do_check=true -do_autoconf=true +do_autoconf=false do_git=false for arg; do case $arg in --help) - exec echo "$0: usage: $0 [all|autoconf|git]";; + exec echo "$0: usage: $0 [--no-check] [target...] + Targets are: all autoconf git";; --no-check) do_check=false;; all) + do_autoconf=true test -e .git && do_git=true;; autoconf) - true;; + do_autoconf=true;; git) - do_autoconf=false do_git=true;; *) echo >&2 "$0: $arg: unknown argument"; exit 1;; esac done +case $do_autoconf,$do_git in + false,false) + do_autoconf=true;; +esac # Generate Autoconf and Automake related files, if requested. @@ -143,7 +148,7 @@ if $do_autoconf; then eval min=\$${sprog}_min - echo "Checking for $prog (need at least version $min)..." + printf '%s' "Checking for $prog (need at least version $min) ... " check_version $prog $min |