mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-06 06:20:55 -08:00
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)
This commit is contained in:
parent
3713c7a062
commit
70d6f2d14f
1 changed files with 10 additions and 5 deletions
15
autogen.sh
15
autogen.sh
|
|
@ -104,27 +104,32 @@ check_version ()
|
||||||
}
|
}
|
||||||
|
|
||||||
do_check=true
|
do_check=true
|
||||||
do_autoconf=true
|
do_autoconf=false
|
||||||
do_git=false
|
do_git=false
|
||||||
|
|
||||||
for arg; do
|
for arg; do
|
||||||
case $arg in
|
case $arg in
|
||||||
--help)
|
--help)
|
||||||
exec echo "$0: usage: $0 [all|autoconf|git]";;
|
exec echo "$0: usage: $0 [--no-check] [target...]
|
||||||
|
Targets are: all autoconf git";;
|
||||||
--no-check)
|
--no-check)
|
||||||
do_check=false;;
|
do_check=false;;
|
||||||
all)
|
all)
|
||||||
|
do_autoconf=true
|
||||||
test -e .git && do_git=true;;
|
test -e .git && do_git=true;;
|
||||||
autoconf)
|
autoconf)
|
||||||
true;;
|
do_autoconf=true;;
|
||||||
git)
|
git)
|
||||||
do_autoconf=false
|
|
||||||
do_git=true;;
|
do_git=true;;
|
||||||
*)
|
*)
|
||||||
echo >&2 "$0: $arg: unknown argument"; exit 1;;
|
echo >&2 "$0: $arg: unknown argument"; exit 1;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
|
case $do_autoconf,$do_git in
|
||||||
|
false,false)
|
||||||
|
do_autoconf=true;;
|
||||||
|
esac
|
||||||
|
|
||||||
# Generate Autoconf and Automake related files, if requested.
|
# Generate Autoconf and Automake related files, if requested.
|
||||||
|
|
||||||
|
|
@ -143,7 +148,7 @@ if $do_autoconf; then
|
||||||
|
|
||||||
eval min=\$${sprog}_min
|
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
|
check_version $prog $min
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue