make.test

[Patrick Welche]

Actually, you really don't want set -e in make.test:

for flag in '' -w; do
   MAKE="$save $flag" ./configure

   fgrep 'am__include = #' Makefile && exit 1

   touch configure.in
   $MAKE $flag

   fgrep 'am__include = #' Makefile && exit 1

   rm -f config.cache
done

With set -e, you're saying "If I don't find 'am__include = #' in Makefile,
bomb out of the test as fgrep returned 1!=0", whereas I think what you want
to say is "If I do find 'am__include = #' in Makefile, bomb out of test"
(which is what happens without set -e), so the following patch seems to make
more sense. (Thanks to Christos for pointing out the crux of the matter to
me)

Cheers,

Patrick
(If -v isn't portable, then just get rid of set -e, no?)


Index: make.test
===================================================================
RCS file: /cvs/automake/automake/tests/make.test,v
retrieving revision 1.5
diff -p -r1.5 make.test
*** make.test   2001/12/26 08:22:06     1.5
--- make.test   2002/02/15 12:00:42
*************** save="$MAKE"
*** 33,44 ****
  for flag in '' -w; do
     MAKE="$save $flag" ./configure
  
!    fgrep 'am__include = #' Makefile && exit 1
  
     touch configure.in
     $MAKE $flag
  
!    fgrep 'am__include = #' Makefile && exit 1
  
     rm -f config.cache
  done
--- 33,44 ----
  for flag in '' -w; do
     MAKE="$save $flag" ./configure
  
!    fgrep -v 'am__include = #' Makefile
  
     touch configure.in
     $MAKE $flag
  
!    fgrep -v 'am__include = #' Makefile
  
     rm -f config.cache
  done