Merge branch 'maint'

* maint:
  dryrun: $(am__dry_run) not confused by metachars in $(MAKEFLAGS)

diff --combined lib/am/header-vars.am
index fe38903,2d81009..ba4aa0b
--- 1/lib/am/header-vars.am
--- 2/lib/am/header-vars.am
+++ b/lib/am/header-vars.am
@@@ -1,5 -1,6 +1,5 @@@
  ## automake - create Makefile.in from Makefile.am
 -## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2003, 2005,
 -## 2006 Free Software Foundation, Inc.
 +## Copyright (C) 1994-2012 Free Software Foundation, Inc.
  
  ## This program is free software; you can redistribute it and/or modify
  ## it under the terms of the GNU General Public License as published by
@@@ -30,20 -31,28 +30,28 @@@ VPATH = @srcdir
  ## ("make -n") or not.  Useful in rules that invoke make recursively,
  ## and are thus executed also with "make -n" -- either because they
  ## are declared as dependencies to '.MAKE' (NetBSD make), or because
- ## their recipes contain the "$(MAKE)" string (GNU and Solari make).
+ ## their recipes contain the "$(MAKE)" string (GNU and Solaris make).
  
- ## The case statement has [:] in order to not tickle makefile-deps.test
- ## which greps for '^ *:'.
  am__make_dryrun = \
    { \
      am__dry=no; \
-     for am__flg in : $(MAKEFLAGS); do \
-       case $$am__flg in \
-         [:]) ;; \
-         *=*|--*) ;; \
-         *n*) am__dry=yes; break;; \
-       esac; \
-     done; \
+     case $$MAKEFLAGS in \
+ ## If we run "make TESTS='snooze nap'", GNU make will export MAKEFLAGS
+ ## to "TESTS=foo\ nap", so that the simpler loop below (on word-splitted
+ ## $$MAKEFLAGS) would see a "make flag" equal to "nap", and would wrongly
+ ## misinterpret that as and indication that make is running in dry mode.
+ ## This has already happened in practice.  So we need this hack.
+       *\\[\ \ ]*) \
+         echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+           | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+       *) \
+         for am__flg in $$MAKEFLAGS; do \
+           case $$am__flg in \
+             *=*|--*) ;; \
+             *n*) am__dry=yes; break;; \
+           esac; \
+         done;; \
+     esac; \
      test $$am__dry = yes; \
    }