[Emacs-diffs] /srv/bzr/emacs/trunk r103765: Make autogen.sh respect AUTOCONF etc.

[Glenn Morris]

------------------------------------------------------------
revno: 103765
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2011-03-27 17:48:39 -0700
message:
  Make autogen.sh respect AUTOCONF etc.
  
  * autogen.sh (get_version): Discard "not found" lines.
  (check_version): Respect $AUTOCONF etc environment variables.
modified:
  ChangeLog
  autogen.sh

=== modified file 'ChangeLog'
--- a/ChangeLog 2011-03-27 02:27:11 +0000
+++ b/ChangeLog 2011-03-28 00:48:39 +0000
@@ -1,3 +1,8 @@
+2011-03-28  Glenn Morris  <address@hidden>
+
+       * autogen.sh (get_version): Discard "not found" lines.
+       (check_version): Respect $AUTOCONF etc environment variables.
+
 2011-03-27  Glenn Morris  <address@hidden>
 
        * configure.in (AC_TYPE_SIGNAL): Remove obsolete macro.

=== modified file 'autogen.sh'
--- a/autogen.sh        2011-03-25 07:14:31 +0000
+++ b/autogen.sh        2011-03-28 00:48:39 +0000
@@ -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 @@
 ## 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 @@
 ## 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