[Automake-commit] [SCM] GNU Automake branch, branch-1-10, updated. v1.10.2-3-gf9fdeaf

[Ralf Wildenhues]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=f9fdeafd87c7fc0dc16449a3d5a22d41d4ec9f35

The branch, branch-1-10 has been updated
       via  f9fdeafd87c7fc0dc16449a3d5a22d41d4ec9f35 (commit)
      from  a943c4a3fc152badce98baac9b81009f82edcd35 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f9fdeafd87c7fc0dc16449a3d5a22d41d4ec9f35
Author: Ralf Wildenhues <address@hidden>
Date:   Mon Nov 24 07:44:33 2008 +0100

    Let `missing' also work with versioned and prefixed programs.
    
    * lib/missing: Ignore prefixes of `gnu-', `gnu', and `g' when
    testing for known programs; also, ignore suffixes.
    * tests/missing.test: Amend test.
    * NEWS, THANKS: Update.
    Report by Tim Rice.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog          |    9 +++++++++
 NEWS               |    2 ++
 THANKS             |    1 +
 lib/missing        |   37 ++++++++++++++++++++++---------------
 tests/missing.test |   13 ++++++++++++-
 5 files changed, 46 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 801d9ac..5015b11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-11-24  Ralf Wildenhues  <address@hidden>
+
+       Let `missing' also work with versioned and prefixed programs.
+       * lib/missing: Ignore prefixes of `gnu-', `gnu', and `g' when
+       testing for known programs; also, ignore suffixes.
+       * tests/missing.test: Amend test.
+       * NEWS, THANKS: Update.
+       Report by Tim Rice.
+
 2008-11-23  William Pursell  <address@hidden>
 
        * doc/automake.texi (Macro search path, Extending aclocal)
diff --git a/NEWS b/NEWS
index 011abc1..7b4443a 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,8 @@ Bugs fixed in 1.10.2a:
 
 * Long standing bugs:
 
+  - The `missing' script works better with versioned tool names.
+
 * Bugs introduced by 1.10.2:
 
 
diff --git a/THANKS b/THANKS
index 4ac04b0..342c4da 100644
--- a/THANKS
+++ b/THANKS
@@ -304,6 +304,7 @@ Thomas Schwinge             address@hidden
 Thomas Tanner          address@hidden
 Tim Goodwin            address@hidden
 Tim Mooney             address@hidden
+Tim Rice               address@hidden
 Tim Van Holder         address@hidden
 Toshio Kuratomi                address@hidden
 Tom Epperly            address@hidden
diff --git a/lib/missing b/lib/missing
index 1c8ff70..96374c4 100755
--- a/lib/missing
+++ b/lib/missing
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2006-05-10.23
+scriptversion=2008-11-24.07
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-#   Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008  Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <address@hidden>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
@@ -89,6 +89,9 @@ Supported PROGRAM values:
   tar          try tar, gnutar, gtar, then tar without non-portable flags
   yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
 
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
 Send bug reports to <address@hidden>."
     exit $?
     ;;
@@ -106,15 +109,19 @@ Send bug reports to <address@hidden>."
 
 esac
 
+# normalize program name to check for.
+program=`echo "$1" | sed 's/^gnu-//; t; s/^gnu//; t; s/^g//; t'`
+
 # Now exit if we have it, but it failed.  Also exit now if we
 # don't have it and --version was passed (most likely to detect
-# the program).
+# the program).  This is about non-GNU programs, so use $1 not
+# $program.
 case $1 in
-  lex|yacc)
+  lex*|yacc*)
     # Not GNU programs, they don't have --version.
     ;;
 
-  tar)
+  tar*)
     if test -n "$run"; then
        echo 1>&2 "ERROR: \`tar' requires --run"
        exit 1
@@ -138,7 +145,7 @@ esac
 
 # If it does not exist, or fails to run (possibly an outdated version),
 # try to emulate it.
-case $1 in
+case $program in
   aclocal*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
@@ -148,7 +155,7 @@ WARNING: \`$1' is $msg.  You should only need it if
     touch aclocal.m4
     ;;
 
-  autoconf)
+  autoconf*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
          you modified \`${configure_ac}'.  You might want to install the
@@ -157,7 +164,7 @@ WARNING: \`$1' is $msg.  You should only need it if
     touch configure
     ;;
 
-  autoheader)
+  autoheader*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
          you modified \`acconfig.h' or \`${configure_ac}'.  You might want
@@ -187,7 +194,7 @@ WARNING: \`$1' is $msg.  You should only need it if
           while read f; do touch "$f"; done
     ;;
 
-  autom4te)
+  autom4te*)
     echo 1>&2 "\
 WARNING: \`$1' is needed, but is $msg.
          You might have modified some files without having the
@@ -210,7 +217,7 @@ WARNING: \`$1' is needed, but is $msg.
     fi
     ;;
 
-  bison|yacc)
+  bison*|yacc*)
     echo 1>&2 "\
 WARNING: \`$1' $msg.  You should only need it if
          you modified a \`.y' file.  You may need the \`Bison' package
@@ -240,7 +247,7 @@ WARNING: \`$1' $msg.  You should only need it if
     fi
     ;;
 
-  lex|flex)
+  lex*|flex*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
          you modified a \`.l' file.  You may need the \`Flex' package
@@ -263,7 +270,7 @@ WARNING: \`$1' is $msg.  You should only need it if
     fi
     ;;
 
-  help2man)
+  help2man*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
         you modified a dependency of a manual page.  You may need the
@@ -281,7 +288,7 @@ WARNING: \`$1' is $msg.  You should only need it if
     fi
     ;;
 
-  makeinfo)
+  makeinfo*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
          you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -310,7 +317,7 @@ WARNING: \`$1' is $msg.  You should only need it if
     touch $file
     ;;
 
-  tar)
+  tar*)
     shift
 
     # We have already tried tar in the generic part.
diff --git a/tests/missing.test b/tests/missing.test
index 0370f0f..e218423 100755
--- a/tests/missing.test
+++ b/tests/missing.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 2003, 2004, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2006, 2008  Free Software Foundation,
+# Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -47,6 +48,16 @@ $sleep
 echo 'AC_PREREQ(9999)' >> aclocal.m4
 $MAKE distdir
 
+# Try version number suffixes if we can add them safely.
+case $MYAUTOCONF in *autoconf)
+  ./configure AUTOCONF="${MYAUTOCONF}6789"
+  $MAKE
+  $sleep
+  # Hopefully the install version of Autoconf cannot compete with this one...
+  echo 'AC_PREREQ(9999)' >> aclocal.m4
+  $MAKE distdir
+esac
+
 # Run again, but without missing, to ensure that timestamps were updated.
 export AUTOMAKE ACLOCAL
 ./configure AUTOCONF="$MYAUTOCONF"


hooks/post-receive
--
GNU Automake