From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sat, 24 Nov 2012 11:38:56 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: v1.12b~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe1625a4b00b402d6333be0d7999a41ed4983204;p=thirdparty%2Fautomake.git

Merge branch 'maint'

* maint:
  tests: fix a spurious failure with older flex versions
---

fe1625a4b00b402d6333be0d7999a41ed4983204
diff --cc t/lex-header.sh
index d50a1ef20,ad2976e35..f1283f662
--- a/t/lex-header.sh
+++ b/t/lex-header.sh
@@@ -18,8 -18,14 +18,14 @@@
  # bugs #8844 and #9933).
  
  required='cc flex'
 -. ./defs || exit 1
 +. test-init.sh
  
+ # Here, we need to use the use flex option '--header-file', but some
+ # older flex versions don't support is (see automake bug#11524 and
+ # bug#12836).  Skip this test if such an old flex version is detected.
+ $LEX --help | grep '.*--header-file' \
+   || skip_ "flex doesn't support the --header-file' option"
+ 
  cat >> configure.ac << 'END'
  AC_PROG_CC
  AC_PROG_LEX