[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-809-g0ab2e46

[Stefano Lattarini]

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=0ab2e466557486162d83f9682c035f434a26bdac

The branch, master has been updated
       via  0ab2e466557486162d83f9682c035f434a26bdac (commit)
       via  1ada3973ce2ece03695b068477e08253f8d18b5f (commit)
      from  be569feaa4dcf1eb2b906f730a57fcd1df8ad508 (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 0ab2e466557486162d83f9682c035f434a26bdac
Merge: be569fe 1ada397
Author: Stefano Lattarini <address@hidden>
Date:   Wed May 4 22:21:53 2011 +0200

    Merge branch 'maint'
    
    With some edits to `tests/defs' and `ChangeLog', to reflect the
    fact that in master we already had a `yacc' requirement, and no
    more had an explicitly-recognized `bison' requirement.

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

Summary of changes:
 ChangeLog  |   15 +++++++++++++++
 tests/defs |   10 ++++++++++
 2 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bfd90cd..77ec72b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2011-05-04  Stefano Lattarini  <address@hidden>
+
+       tests defs: allow requirements for compilers (mostly dummy)
+       Most of the new requirements that are now accepted in `$required'
+       as consequence of this patch are still dummy.  They are planned
+       to be implemented only in master (or in some derived branch), but
+       having them here (even just as no-op) will allow for an easier
+       integration/backporting of potential new testcases.
+       * tests/defs.in (cc, c++, fortran, fortran77): New requirements,
+       still dummy.
+       (flex): New requirement, picking LEX for configure.
+       (lex): New requirement, alias for `flex'.  A more appropriate
+       implementation, looking for a generic `lex' program, will follow
+       in the future.
+
 2011-05-03  Stefano Lattarini  <address@hidden>
 
        tests: add forgotten test scripts to $(TESTS)
diff --git a/tests/defs b/tests/defs
index 46ff08b..6ee1830 100644
--- a/tests/defs
+++ b/tests/defs
@@ -238,6 +238,9 @@ do
   # Check that each required tool is present.
   case $tool in
     :) ;;
+    cc|c++|fortran|fortran77)
+      echo "$me: dummy requirement '$tool', no check done"
+      ;;
     bzip2)
       # Do not use --version, bzip2 still tries to compress stdin.
       echo "$me: running bzip2 --help"
@@ -404,6 +407,13 @@ do
        && eval 'test $(( 1 + 1 )) -eq 2 \
        && test "${#_am_dummy}" -eq 5' ) || exit 77
       ;;
+    flex|lex)
+      # Since flex is required, we pick LEX for ./configure.
+      LEX=flex
+      export LEX
+      echo "$me: running flex --version"
+      flex --version || exit 77
+      ;;
     yacc)
       if test x"$YACC" = x"no"; then
         # The user has explicitly told he doesn't want a yacc program


hooks/post-receive
-- 
GNU Automake