From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Fri, 21 Jan 2011 20:54:08 +0000 (+0100)
Subject: Fix LEXLIB and YYTEXT_POINTER with IRIX 6.5 flex 2.5.4.
X-Git-Tag: v2.68b~120
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f6115b10db4a1b755394fbcef5923d81a4359e4;p=thirdparty%2Fautoconf.git

Fix LEXLIB and YYTEXT_POINTER with IRIX 6.5 flex 2.5.4.

* lib/autoconf/programs.m4 (_AC_PROG_LEX_YYTEXT_DECL):
Overquote nontrivial yyless argument, to compensate for
underquoted macro definition in IRIX 6.5 flex 2.5.4
leading to compile failure due to incompatible operands.
Fixes Automake silent-lex-generic.test failure.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
---

diff --git a/ChangeLog b/ChangeLog
index c314e63e..13594f18 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-21  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Fix LEXLIB and YYTEXT_POINTER with IRIX 6.5 flex 2.5.4.
+	* lib/autoconf/programs.m4 (_AC_PROG_LEX_YYTEXT_DECL):
+	Overquote nontrivial yyless argument, to compensate for
+	underquoted macro definition in IRIX 6.5 flex 2.5.4
+	leading to compile failure due to incompatible operands.
+	Fixes Automake silent-lex-generic.test failure.
+
 2011-01-17  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	docs: Tru64/OSF sh treats read as special builtin
diff --git a/lib/autoconf/programs.m4 b/lib/autoconf/programs.m4
index 0def8b2f..fb3d8b91 100644
--- a/lib/autoconf/programs.m4
+++ b/lib/autoconf/programs.m4
@@ -724,7 +724,8 @@ a { ECHO; }
 b { REJECT; }
 c { yymore (); }
 d { yyless (1); }
-e { yyless (input () != 0); }
+e { /* IRIX 6.5 flex 2.5.4 underquotes its yyless argument.  */
+    yyless ((input () != 0)); }
 f { unput (yytext[0]); }
 . { BEGIN INITIAL; }
 %%