automake 1.7 (CVS) test failure when make =! GNU make

[ezra peisach]

Running on an irix machine - with GNUmake installed as gmake, a few tests fail
and one has problems.

a) The test in tests/defs.in, the existance of "make --version" is used
as a test for it being GNUmake. SGI's make exists with a zero exit
status and no warnings.

A fix for this problem is to use
$MAKE --version -v

GNU make is happy with these options, and SGI';s make will bomb on
make -v.

b) lex5.test. It is setting required to make and not GNUmake.so 
the GNUmake testing never happens

c) dollar.test: Check exit status of running defs - if make !=
GNUmake, do not run test.

         Ezra

Patch:

Index: defs.in
===================================================================
RCS file: /cvsroot/automake/automake/tests/defs.in,v
retrieving revision 1.4
diff -c -r1.4 defs.in
*** defs.in     25 Sep 2002 18:46:47 -0000      1.4
--- defs.in     30 Sep 2002 18:01:03 -0000
***************
*** 73,79 ****
        ;;
        GNUmake)
        echo "$me: running $MAKE --version"
!       ( $MAKE --version ) || exit 77
        ;;
        gcc)
          # When gcc is required, export `CC=gcc' so that ./configure
--- 73,79 ----
        ;;
        GNUmake)
        echo "$me: running $MAKE --version"
!       ( $MAKE --version -v ) || exit 77
        ;;
        gcc)
          # When gcc is required, export `CC=gcc' so that ./configure
Index: dollar.test
===================================================================
RCS file: /cvsroot/automake/automake/tests/dollar.test,v
retrieving revision 1.5
diff -c -r1.5 dollar.test
*** dollar.test 8 Sep 2002 13:07:55 -0000       1.5
--- dollar.test 30 Sep 2002 18:01:21 -0000
***************
*** 25,31 ****
  # Require GNU make for this test.  SunOS Make does not support
  # `$$' in a target or a dependency (it outputs the empty string instead).
  required=GNUmake
! . ./defs
  
  set -e
  
--- 25,31 ----
  # Require GNU make for this test.  SunOS Make does not support
  # `$$' in a target or a dependency (it outputs the empty string instead).
  required=GNUmake
! . ./defs || exit 1
  
  set -e
  
Index: lex5.test
===================================================================
RCS file: /cvsroot/automake/automake/tests/lex5.test,v
retrieving revision 1.3
diff -c -r1.3 lex5.test
*** lex5.test   8 Sep 2002 13:07:55 -0000       1.3
--- lex5.test   30 Sep 2002 18:01:21 -0000
***************
*** 20,26 ****
  
  # Test for subdir lexers.
  
! required='gcc make gzip'
  . ./defs || exit 1
  
  set -e
--- 20,26 ----
  
  # Test for subdir lexers.
  
! required='gcc GNUmake gzip'
  . ./defs || exit 1
  
  set -e