[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 70d6f2d: Restore behavior of ‘./autogen.sh autocon
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] master 70d6f2d: Restore behavior of ‘./autogen.sh autoconf git’ |
Date: |
Thu, 12 Jan 2017 23:08:19 +0000 (UTC) |
branch: master
commit 70d6f2d14f87ab8fe164e1d461b7a55ed1ca3c62
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
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)
---
autogen.sh | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index cb2a915..bb3f818 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 70d6f2d: Restore behavior of ‘./autogen.sh autoconf git’,
Paul Eggert <=