Commit 42e85a8f authored by Glenn Morris's avatar Glenn Morris

Make autogen.sh respect AUTOCONF etc.

* autogen.sh (get_version): Discard "not found" lines.
(check_version): Respect $AUTOCONF etc environment variables.
parent 5ffb62aa
2011-03-28 Glenn Morris <rgm@gnu.org>
* autogen.sh (get_version): Discard "not found" lines.
(check_version): Respect $AUTOCONF etc environment variables.
2011-03-27 Glenn Morris <rgm@gnu.org>
* configure.in (AC_TYPE_SIGNAL): Remove obsolete macro.
......
......@@ -30,6 +30,7 @@
### Code:
## Tools we need:
## Note that we respect the values of AUTOCONF etc, like autoreconf does.
progs="autoconf automake"
## Minimum versions we need:
......@@ -46,7 +47,8 @@ automake_min=1.11
## Also note that we do not handle micro versions.
get_version ()
{
$1 --version 2>&1 | sed -n '1 s/.* \([1-9][0-9\.]*\).*/\1/p'
## Remove eg "./autogen.sh: line 50: autoconf: command not found".
$1 --version 2>&1 | sed -e '/not found/d' -n -e '1 s/.* \([1-9][0-9\.]*\).*/\1/p'
}
## $1 = version string, eg "2.59"
......@@ -71,7 +73,14 @@ minor_version ()
## Return 3 for unexpected error (eg failed to parse version).
check_version ()
{
have_version=`get_version $1`
## Respect eg $AUTOMAKE if it is set, like autoreconf does.
uprog=`echo $1 | sed 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
eval uprog=\$${uprog}
[ x"$uprog" = x ] && uprog=$1
have_version=`get_version $uprog`
[ x"$have_version" = x ] && return 1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment