[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.11-639-g59367c0

[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=59367c05bbfd19062c6754f088d16bec33f39b54

The branch, maint has been updated
       via  59367c05bbfd19062c6754f088d16bec33f39b54 (commit)
      from  0188e0f50e4b9802f50ccaa11390a364db7354a6 (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 59367c05bbfd19062c6754f088d16bec33f39b54
Author: Stefano Lattarini <address@hidden>
Date:   Sat Jan 14 10:32:13 2012 +0100

    test defs: backport optimized 'using_gmake' implementation
    
    * tests/defs.in (using_gmake): Backport optimized, result-caching
    implementation from master.

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

Summary of changes:
 tests/defs.in |   25 +++++++++++++++++++++----
 1 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/tests/defs.in b/tests/defs.in
index 0ee53c2..31426f2 100644
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -493,13 +493,30 @@ is_newest ()
 # using_gmake
 # -----------
 # Return success if $MAKE is GNU make, return failure otherwise.
+# Caches the result for speed reasons.
 using_gmake ()
 {
-  # Use --version AND -v, because SGI Make doesn't fail on --version.
-  # Also grep for GNU because newer versions of FreeBSD make do
-  # not complain about `--version' (they seem to silently ignore it).
-  $MAKE --version -v | grep GNU
+  case $am__using_gmake in
+    yes)
+      return 0;;
+    no)
+      return 1;;
+    '')
+      # Use --version AND -v, because SGI Make doesn't fail on --version.
+      # Also grep for GNU because newer versions of FreeBSD make do
+      # not complain about `--version' (they seem to silently ignore it).
+      if $MAKE --version -v | grep GNU; then
+        am__using_gmake=yes
+        return 0
+      else
+        am__using_gmake=no
+        return 1
+      fi;;
+    *)
+      fatal_ "invalid value for \$am__using_gmake: '$am__using_gmake'";;
+  esac
 }
+am__using_gmake="" # Avoid interferences from the environment.
 
 # AUTOMAKE_run status [options...]
 # --------------------------------


hooks/post-receive
-- 
GNU Automake