r983 - trunk/flex

archaic at linuxfromscratch.org archaic at linuxfromscratch.org
Mon Jun 20 09:40:47 PDT 2005


Author: archaic
Date: 2005-06-20 10:40:45 -0600 (Mon, 20 Jun 2005)
New Revision: 983

Added:
   trunk/flex/flex-2.5.31-debian_fixes-3.patch
Removed:
   trunk/flex/flex-2.5.31-debian_fixes-4.patch
Log:
Removed a broken flex patch and added another. Using -3 as it seems to have been a skipped version number and -4 was never put into the book.

Added: trunk/flex/flex-2.5.31-debian_fixes-3.patch
===================================================================
--- trunk/flex/flex-2.5.31-debian_fixes-3.patch	2005-06-20 16:25:51 UTC (rev 982)
+++ trunk/flex/flex-2.5.31-debian_fixes-3.patch	2005-06-20 16:40:45 UTC (rev 983)
@@ -0,0 +1,3924 @@
+Submitted By: Matthew Burgess <matthew at linuxfromscratch.org>
+Date: 2005-06-15
+Initial Package Version: 2.5.31
+Origin: http://ftp.debian.org/debian/pool/main/f/flex/flex_2.5.31-31.diff.gz
+Description: This fixes a number of problems with the upstream version of flex.
+             Debian specific changes and autotool related changes were removed
+             from the original to make it a more manageable size.
+
+diff -Naur flex-2.5.31.orig/filter.c flex-2.5.31/filter.c
+--- flex-2.5.31.orig/filter.c	2003-03-25 16:39:08.000000000 +0000
++++ flex-2.5.31/filter.c	2005-06-12 18:45:28.096437384 +0000
+@@ -157,11 +157,15 @@
+ 		if (chain->filter_func) {
+ 			int     r;
+ 
+-			/* setup streams again */
++			/* setup streams again  -- Removed. POSIX states that children inherit
++			   open streams in the parent. Also, ANSI C99 states that the stdin
++				 and stdout macors need not be modified lvalues; so this code is 
++				 broken in the first place.
+ 			if ((stdin = fdopen (0, "r")) == NULL)
+ 				flexfatal (_("fdopen(0) failed"));
+ 			if ((stdout = fdopen (1, "w")) == NULL)
+ 				flexfatal (_("fdopen(1) failed"));
++      */
+ 
+ 			if ((r = chain->filter_func (chain)) == -1)
+ 				flexfatal (_("filter_func failed"));
+@@ -181,9 +185,11 @@
+ 	if (dup2 (pipes[1], 1) == -1)
+ 		flexfatal (_("dup2(pipes[1],1)"));
+ 	close (pipes[1]);
++	/* This is not legal; stfout does not need to be a modifiable
++	lvalue 
+ 	if ((stdout = fdopen (1, "w")) == NULL)
+ 		flexfatal (_("fdopen(1) failed"));
+-
++	*/
+ 	return true;
+ }
+ 
+diff -Naur flex-2.5.31.orig/flex.skl flex-2.5.31/flex.skl
+--- flex-2.5.31.orig/flex.skl	2003-04-01 01:51:38.000000000 +0000
++++ flex-2.5.31/flex.skl	2005-06-12 18:45:27.484530408 +0000
+@@ -27,6 +27,11 @@
+ %# Macros for runtime processing stage.
+ m4_changecom
+ m4_changequote
++
++%# Let user use our quoting strings
++m4_changequote({, })
++m4_define( {m4_userquote_start}, {m4_changequote(<, >)[[m4_changequote([[, ]])})
++m4_define( {m4_userquote_end}, {m4_changequote(<, >)]]m4_changequote([[, ]])})
+ m4_changequote([[, ]])
+ 
+ %# 
+@@ -345,19 +350,19 @@
+ %#        yyscan_t yyscanner;
+ %#
+ %# Generate traditional function defs
+-    m4_define( [[YYFARGS0]], [[(M4_YY_DEF_ONLY_ARG)
++    m4_define( [[YYFARGS0]], [[(M4_YY_DEF_ONLY_ARG) [[\]]
+         M4_YY_DECL_LAST_ARG]])
+-    m4_define( [[YYFARGS1]], [[($2 M4_YY_DEF_LAST_ARG)
+-        $1 $2;
++    m4_define( [[YYFARGS1]], [[($2 M4_YY_DEF_LAST_ARG) [[\]]
++        $1 $2; [[\]]
+         M4_YY_DECL_LAST_ARG]])
+-    m4_define( [[YYFARGS2]], [[($2,$4 M4_YY_DEF_LAST_ARG)
+-        $1 $2;
+-        $3 $4;
++    m4_define( [[YYFARGS2]], [[($2,$4 M4_YY_DEF_LAST_ARG) [[\]]
++        $1 $2; [[\]]
++        $3 $4; [[\]]
+         M4_YY_DECL_LAST_ARG]])
+-    m4_define( [[YYFARGS3]], [[($2,$4,$6 M4_YY_DEF_LAST_ARG)
+-        $1 $2;
+-        $3 $4;
+-        $5 $6;
++    m4_define( [[YYFARGS3]], [[($2,$4,$6 M4_YY_DEF_LAST_ARG) [[\]]
++        $1 $2; [[\]]
++        $3 $4; [[\]]
++        $5 $6; [[\]]
+         M4_YY_DECL_LAST_ARG]])
+ ]],
+ [[
+@@ -724,6 +729,7 @@
+ 
+ m4_ifdef( [[M4_YY_NO_UNISTD_H]],,
+ [[
++#ifndef YY_NO_UNISTD_H
+ /* Special case for "unistd.h", since it is non-ANSI. We include it way
+  * down here because we want the user's section 1 to have been scanned first.
+  * The user has a chance to override it with an option.
+@@ -734,6 +740,7 @@
+ %if-c++-only
+ #include <unistd.h>
+ %endif
++#endif
+ ]])
+ 
+ #ifndef YY_EXTRA_TYPE
+@@ -1124,9 +1131,9 @@
+     m4_dnl  The bison pure parser is used. Redefine yylex to
+     m4_dnl  accept the lval parameter.
+ 
+-    m4_define( [[M4_YY_LEX_PROTO]],
++    m4_define( [[M4_YY_LEX_PROTO]], [[\]]
+                [[M4_YY_PARAMS(YYSTYPE * yylval_param M4_YY_PROTO_LAST_ARG)]])
+-    m4_define( [[M4_YY_LEX_DECLARATION]],
++    m4_define( [[M4_YY_LEX_DECLARATION]], [[\]]
+                [[YYFARGS1(YYSTYPE *,yylval_param)]])
+ ]])
+ 
+@@ -1134,9 +1141,9 @@
+ [[
+     m4_dnl  Locations are used. yylex should also accept the ylloc parameter.
+ 
+-    m4_define( [[M4_YY_LEX_PROTO]],
++    m4_define( [[M4_YY_LEX_PROTO]], [[\]]
+                [[M4_YY_PARAMS(YYSTYPE * yylval_param, YYLTYPE * yylloc_param M4_YY_PROTO_LAST_ARG)]])
+-    m4_define( [[M4_YY_LEX_DECLARATION]],
++    m4_define( [[M4_YY_LEX_DECLARATION]], [[\]]
+                [[YYFARGS2(YYSTYPE *,yylval_param, YYLTYPE *,yylloc_param)]])
+ ]])
+ 
+@@ -2251,11 +2258,11 @@
+  * @note If you want to scan bytes that may contain NUL values, then use
+  *       yy_scan_bytes() instead.
+  */
+-YY_BUFFER_STATE yy_scan_string YYFARGS1( yyconst char *,str)
++YY_BUFFER_STATE yy_scan_string YYFARGS1( yyconst char *,yy_str)
+ {
+     m4_dnl M4_YY_DECL_GUTS_VAR();
+ 
+-	return yy_scan_bytes( str, strlen(str) M4_YY_CALL_LAST_ARG);
++	return yy_scan_bytes( yy_str, strlen(yy_str) M4_YY_CALL_LAST_ARG);
+ }
+ %endif
+ ]])
+diff -Naur flex-2.5.31.orig/gen.c flex-2.5.31/gen.c
+--- flex-2.5.31.orig/gen.c	2003-03-30 19:58:44.000000000 +0000
++++ flex-2.5.31/gen.c	2005-06-12 18:45:27.486530104 +0000
+@@ -1812,7 +1812,6 @@
+ 			if (yytext_is_array) {
+ 				if (!reentrant){
+     				indent_puts ("static int yy_more_offset = 0;");
+-                }else{
+                     indent_puts ("static int yy_prev_more_offset = 0;");
+                 }
+ 			}
+diff -Naur flex-2.5.31.orig/main.c flex-2.5.31/main.c
+--- flex-2.5.31.orig/main.c	2003-04-01 01:51:38.000000000 +0000
++++ flex-2.5.31/main.c	2005-06-12 18:45:28.056443464 +0000
+@@ -199,6 +199,7 @@
+ {
+ #if ENABLE_NLS
+ 	setlocale (LC_MESSAGES, "");
++	setlocale (LC_CTYPE, "");
+ 	textdomain (PACKAGE);
+ 	bindtextdomain (PACKAGE, LOCALEDIR);
+ #endif
+@@ -1595,7 +1596,6 @@
+ 			outn ("#else");
+ 			outn (yy_stdinit);
+ 			outn ("#endif");
+-			outn ("#endif");
+ 		}
+ 
+ 		else {
+diff -Naur flex-2.5.31.orig/scan.c flex-2.5.31/scan.c
+--- flex-2.5.31.orig/scan.c	2003-04-01 16:33:17.000000000 +0000
++++ flex-2.5.31/scan.c	2005-06-12 18:45:28.105436016 +0000
+@@ -1,4 +1,4 @@
+-
++ 
+ #line 3 "scan.c"
+ 
+ #define  YY_INT_ALIGNED short int
+@@ -351,8 +351,8 @@
+ 	*yy_cp = '\0'; \
+ 	(yy_c_buf_p) = yy_cp;
+ 
+-#define YY_NUM_RULES 201
+-#define YY_END_OF_BUFFER 202
++#define YY_NUM_RULES 204
++#define YY_END_OF_BUFFER 205
+ /* This struct is not used in this scanner,
+    but its presence is necessary. */
+ struct yy_trans_info
+@@ -360,115 +360,115 @@
+ 	flex_int32_t yy_verify;
+ 	flex_int32_t yy_nxt;
+ 	};
+-static yyconst flex_int16_t yy_accept[973] =
++static yyconst flex_int16_t yy_accept[977] =
+     {   0,
+-        0,    0,    0,    0,  122,  122,  199,  199,    0,    0,
+-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
++        0,    0,    0,    0,  125,  125,  202,  202,    0,    0,
+         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+-      202,  200,    9,   20,  200,   18,    1,   19,  200,  200,
+-      200,  200,   17,  143,  135,  136,  143,  128,  143,  142,
+-      143,  143,  143,  142,  134,  124,  143,  143,  126,  127,
+-      122,  123,  122,  121,  120,  121,  199,  199,   30,   31,
+-       30,   30,   30,   30,   30,   30,   37,   36,   38,  200,
+-      149,  149,  144,  149,  145,  146,  148,  150,  177,  178,
+-
+-      177,  175,  174,  176,  151,  153,  151,  152,  151,  156,
+-      156,  156,  156,  158,  160,  158,  158,  158,  158,  159,
+-      187,  191,  187,  190,  192,  192,  188,  188,  188,  185,
+-      186,  200,  117,  200,   23,   24,   23,   22,  193,  195,
+-      193,  196,  197,  183,  183,  184,  183,  183,  183,  183,
+-      183,  183,  183,  116,   40,   39,  116,  116,  116,  116,
+-       41,  116,  116,  116,  116,  116,  116,  116,  116,  116,
+-      116,  116,  116,  116,  116,  116,  116,  116,  116,  116,
+-      116,  116,   28,   25,   28,   26,   35,   34,  200,   33,
+-       32,    9,   20,    0,   18,    1,   19,    0,    0,    0,
+-
+-       16,   10,    0,    0,    0,    0,    4,   16,    5,    0,
+-        2,   17,  135,  136,    0,    0,    0,  130,    0,    0,
+-      140,  140,    0,  198,  198,  198,  129,    0,  134,  124,
+-        0,    0,    0,  126,  127,  139,  125,    0,  122,  123,
+-      121,  120,  120,  118,  119,  199,  199,   30,   31,   30,
+-       30,   30,   30,   37,   36,   38,    0,  144,    0,  144,
+-      147,  148,  178,  174,  153,    0,  154,  155,  160,  157,
+-      187,  191,    0,  189,    0,  180,  188,  188,  188,    0,
+-      117,    0,   23,   24,   23,   21,  193,  195,  194,  183,
+-      183,  183,  184,  179,  183,  183,  183,   40,   39,    0,
+-
+-      115,    0,    0,  116,  116,  116,  116,  116,  116,  116,
+-      116,  116,  116,  116,  116,  116,  116,  116,  116,  116,
+-      116,  116,   42,  116,  116,  116,  116,  116,  116,  116,
+-      116,  116,  116,  116,    0,   27,   26,   35,   34,    0,
+-       16,   10,    0,   14,    0,    0,    0,    0,    0,    4,
+-       16,    5,    0,    6,    0,  131,    0,  132,    0,    0,
+-      140,  140,    0,  140,  140,  140,  198,  198,    0,  141,
+-      125,  133,    0,  139,    0,  118,  119,   30,   30,   30,
+-       29,   30,    0,    0,    0,    0,    0,    0,    0,    0,
+-        0,    0,    0,    0,  188,  188,  179,  179,  183,  183,
+-
+-        0,    0,  116,  116,  116,  116,  116,  116,  116,   54,
+-      116,  116,  116,   59,  116,  116,  116,  116,  116,  116,
+-      116,  116,  116,  116,  116,  116,  116,  116,  116,  116,
+-      116,  116,  116,  116,  116,  116,  116,  116,    0,  116,
+-      116,  116,  116,  116,  116,  116,  116,  116,    0,    0,
+-        0,   14,    0,    0,    0,    0,    0,    0,    4,    8,
+-        5,    0,  140,  140,  140,  140,  140,  140,  198,  141,
+-        0,    0,   30,   30,    0,    0,    0,    0,    0,    0,
+-        0,    0,    0,    0,    0,    0,    0,  188,  188,  183,
+-      183,   43,   44,  116,  116,  116,  116,  116,  116,  116,
+-
+-      116,  116,  116,   60,   61,  116,  116,  116,  116,   66,
+-      116,  116,  116,  116,  116,  116,  116,   71,  116,  116,
+-      116,  116,  116,  116,  116,  116,  116,   80,    0,    0,
+-        0,  116,  116,  116,  116,  116,  116,  116,  116,  116,
+-        0,   15,    0,    0,    0,    0,    0,    8,    8,    8,
+-        0,  140,  140,  140,  140,  140,  140,    0,    0,   30,
+-       30,  173,    0,    0,    0,    0,    0,    0,    0,    0,
+-        0,    0,    0,    0,  188,  188,  183,  183,   45,  116,
+-      116,   47,  116,   51,  116,  116,  116,  116,   57,  116,
+-      116,   62,  116,  116,  116,  116,  116,  116,  116,  116,
+-
+-      116,  116,  116,   74,  116,  116,  116,  116,   78,  116,
+-        0,    0,    0,    0,  116,  116,  116,  116,  116,  116,
+-      116,  116,  116,    3,    0,    0,    0,    8,    7,    8,
+-        0,  140,  140,  140,    0,    0,   30,   30,    0,    0,
+         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+-      181,  182,  181,  182,  116,  116,  116,   50,  116,  116,
+-      116,  116,  116,  116,  112,  116,  116,  116,  116,  116,
+-      116,  116,  116,  110,  116,   73,  116,   76,  116,   77,
+-      116,    0,    0,    0,    0,  116,  116,   92,    0,  116,
+-       82,  116,    0,   83,    0,   12,    0,   13,    0,  138,
+-
+-        0,  137,    0,    0,    0,    0,    0,    0,    0,    0,
+-        0,    0,    0,    0,  116,  116,  116,  116,  116,  116,
+-      116,   55,  116,   58,  116,  116,  116,  116,  116,  109,
+-      116,   70,  116,  116,   75,  116,   79,    0,    0,    0,
+-        0,   90,  111,    0,    0,    0,    0,    0,    0,  116,
+-      116,    0,    0,    0,    0,    0,    0,  137,    0,    0,
++      205,  203,    9,   20,  203,   18,    1,   19,  203,  203,
++      203,  203,   17,  146,  138,  139,  146,  131,  146,  145,
++      146,  146,  146,  145,  137,  127,  146,  146,  129,  130,
++      125,  126,  125,  124,  123,  124,  202,  202,   33,   34,
++       33,   33,   33,   33,   33,   33,   40,   39,   41,  203,
++      152,  152,  147,  152,  148,  149,  151,  153,  180,  181,
++
++      180,  178,  177,  179,  154,  156,  154,  155,  154,  159,
++      159,  159,  159,  161,  163,  161,  161,  161,  161,  162,
++      190,  194,  190,  193,  195,  195,  191,  191,  191,  188,
++      189,  203,  120,  203,   24,   25,   24,   22,   23,   23,
++      196,  198,  196,  199,  200,  186,  186,  187,  186,  186,
++      186,  186,  186,  186,  186,  119,   43,   42,  119,  119,
++      119,  119,   44,  119,  119,  119,  119,  119,  119,  119,
++      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
++      119,  119,  119,  119,   31,   28,   31,   29,   38,   37,
++      203,   36,   35,    9,   20,    0,   18,    1,   19,    0,
++
++        0,    0,   16,   10,    0,    0,    0,    0,    4,   16,
++        5,    0,    2,   17,  138,  139,    0,    0,    0,  133,
++        0,    0,  143,  143,    0,  201,  201,  201,  132,    0,
++      137,  127,    0,    0,    0,  129,  130,  142,  128,    0,
++      125,  126,  124,  123,  123,  121,  122,  202,  202,   33,
++       34,   33,   33,   33,   33,   40,   39,   41,    0,  147,
++        0,  147,  150,  151,  181,  177,  156,    0,  157,  158,
++      163,  160,  190,  194,    0,  192,    0,  183,  191,  191,
++      191,    0,  120,    0,   24,   25,   24,   21,   26,   27,
++      196,  198,  197,  186,  186,  186,  187,  182,  186,  186,
++
++      186,   43,   42,    0,  118,    0,    0,  119,  119,  119,
++      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
++      119,  119,  119,  119,  119,  119,   45,  119,  119,  119,
++      119,  119,  119,  119,  119,  119,  119,  119,    0,   30,
++       29,   38,   37,    0,   16,   10,    0,   14,    0,    0,
++        0,    0,    0,    4,   16,    5,    0,    6,    0,  134,
++        0,  135,    0,    0,  143,  143,    0,  143,  143,  143,
++      201,  201,    0,  144,  128,  136,    0,  142,    0,  121,
++      122,   33,   33,   33,   32,   33,    0,    0,    0,    0,
++        0,    0,    0,    0,    0,    0,    0,    0,  191,  191,
++
++      182,  182,  186,  186,    0,    0,  119,  119,  119,  119,
++      119,  119,  119,   57,  119,  119,  119,   62,  119,  119,
++      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
++      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
++      119,  119,    0,  119,  119,  119,  119,  119,  119,  119,
++      119,  119,    0,    0,    0,   14,    0,    0,    0,    0,
++        0,    0,    4,    8,    5,    0,  143,  143,  143,  143,
++      143,  143,  201,  144,    0,    0,   33,   33,    0,    0,
+         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+-      116,  116,  116,  116,  116,  116,  116,   56,  116,  116,
+-      116,   67,  116,  116,  116,  116,  116,  116,    0,    0,
+-        0,    0,    0,    0,  101,    0,    0,    0,    0,    0,
+-
+-        0,   81,  116,    0,    0,  102,    0,    0,    0,    0,
+-        0,   11,    0,  161,  162,  163,  164,  165,  166,  167,
+-      168,  169,  170,  171,    0,  116,  116,  116,  116,  116,
+-      116,  116,  116,  116,  116,  116,  116,  116,   72,  116,
+-      116,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+-        0,    0,  103,    0,   91,    0,    0,    0,    0,    0,
+-      104,  172,  116,  116,  116,  116,  116,  116,  116,  116,
+-      116,   64,  116,  116,  116,  116,  116,    0,    0,    0,
+-        0,    0,    0,    0,    0,   97,    0,  107,  105,   98,
+-        0,    0,    0,  108,  106,  116,  116,  116,  116,  116,
+-
+-      116,  116,  112,   63,  116,   69,  116,  113,  116,    0,
+-        0,    0,    0,    0,    0,   93,   95,    0,   94,   96,
+-        0,  116,  116,  116,   52,  116,  116,  116,  116,   65,
+-      116,   85,    0,    0,    0,    0,   86,   99,  100,  116,
+-      116,  116,  116,  116,  116,  116,  114,   84,    0,   88,
+-        0,  116,  116,  116,  116,  116,  116,   87,   89,  116,
+-      116,   49,   53,  116,  116,  116,   48,  116,  116,   68,
+-       46,    0
++        0,  191,  191,  186,  186,   46,   47,  119,  119,  119,
++
++      119,  119,  119,  119,  119,  119,  119,   63,   64,  119,
++      119,  119,  119,   69,  119,  119,  119,  119,  119,  119,
++      119,   74,  119,  119,  119,  119,  119,  119,  119,  119,
++      119,   83,    0,    0,    0,  119,  119,  119,  119,  119,
++      119,  119,  119,  119,    0,   15,    0,    0,    0,    0,
++        0,    8,    8,    8,    0,  143,  143,  143,  143,  143,
++      143,    0,    0,   33,   33,  176,    0,    0,    0,    0,
++        0,    0,    0,    0,    0,    0,    0,    0,  191,  191,
++      186,  186,   48,  119,  119,   50,  119,   54,  119,  119,
++      119,  119,   60,  119,  119,   65,  119,  119,  119,  119,
++
++      119,  119,  119,  119,  119,  119,  119,   77,  119,  119,
++      119,  119,   81,  119,    0,    0,    0,    0,  119,  119,
++      119,  119,  119,  119,  119,  119,  119,    3,    0,    0,
++        0,    8,    7,    8,    0,  143,  143,  143,    0,    0,
++       33,   33,    0,    0,    0,    0,    0,    0,    0,    0,
++        0,    0,    0,    0,  184,  185,  184,  185,  119,  119,
++      119,   53,  119,  119,  119,  119,  119,  119,  115,  119,
++      119,  119,  119,  119,  119,  119,  119,  113,  119,   76,
++      119,   79,  119,   80,  119,    0,    0,    0,    0,  119,
++      119,   95,    0,  119,   85,  119,    0,   86,    0,   12,
++
++        0,   13,    0,  141,    0,  140,    0,    0,    0,    0,
++        0,    0,    0,    0,    0,    0,    0,    0,  119,  119,
++      119,  119,  119,  119,  119,   58,  119,   61,  119,  119,
++      119,  119,  119,  112,  119,   73,  119,  119,   78,  119,
++       82,    0,    0,    0,    0,   93,  114,    0,    0,    0,
++        0,    0,    0,  119,  119,    0,    0,    0,    0,    0,
++        0,  140,    0,    0,    0,    0,    0,    0,    0,    0,
++        0,    0,    0,    0,  119,  119,  119,  119,  119,  119,
++      119,   59,  119,  119,  119,   70,  119,  119,  119,  119,
++      119,  119,    0,    0,    0,    0,    0,    0,  104,    0,
++
++        0,    0,    0,    0,    0,   84,  119,    0,    0,  105,
++        0,    0,    0,    0,    0,   11,    0,  164,  165,  166,
++      167,  168,  169,  170,  171,  172,  173,  174,    0,  119,
++      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
++      119,  119,   75,  119,  119,    0,    0,    0,    0,    0,
++        0,    0,    0,    0,    0,    0,  106,    0,   94,    0,
++        0,    0,    0,    0,  107,  175,  119,  119,  119,  119,
++      119,  119,  119,  119,  119,   67,  119,  119,  119,  119,
++      119,    0,    0,    0,    0,    0,    0,    0,    0,  100,
++        0,  110,  108,  101,    0,    0,    0,  111,  109,  119,
++
++      119,  119,  119,  119,  119,  119,  115,   66,  119,   72,
++      119,  116,  119,    0,    0,    0,    0,    0,    0,   96,
++       98,    0,   97,   99,    0,  119,  119,  119,   55,  119,
++      119,  119,  119,   68,  119,   88,    0,    0,    0,    0,
++       89,  102,  103,  119,  119,  119,  119,  119,  119,  119,
++      117,   87,    0,   91,    0,  119,  119,  119,  119,  119,
++      119,   90,   92,  119,  119,   52,   56,  119,  119,  119,
++       51,  119,  119,   71,   49,    0
+     } ;
+ 
+ static yyconst flex_int32_t yy_ec[256] =
+@@ -507,255 +507,257 @@
+     {   0,
+         1,    1,    2,    1,    3,    4,    1,    1,    1,    5,
+         1,    6,    7,    1,    8,    5,    9,    9,    9,    9,
+-        1,    1,    1,    1,   10,   11,    1,   12,   13,    1,
+-       14,   15,   15,   15,   15,   15,   15,   16,   16,   16,
+-       16,   16,   16,   16,   16,   16,   16,   16,   16,   16,
+-       16,   16,   16,   16,   16,   16,   17,    1,   18
++        1,    1,    1,    1,   10,   11,   12,   13,   14,    1,
++       15,   16,   16,   16,   16,   16,   16,   17,   17,   17,
++       17,   17,   17,   17,   17,   17,   17,   17,   17,   17,
++       17,   17,   17,   17,   17,   17,   18,    1,   19
+     } ;
+ 
+-static yyconst flex_int16_t yy_base[1070] =
++static yyconst flex_int16_t yy_base[1074] =
+     {   0,
+-        0,   59,  117,  175,  121,  129, 3236, 3235,  234, 3228,
+-      138,  144,  293,    0, 3206, 3205,  145,  152,  187,  193,
+-      124,  179,  350,  353,  382,    0,  132,  153,  205,  211,
+-      439,  443,  471,    0,  530,    0,  354,  444,  587,  588,
+-     3234, 3240,  217, 3240, 3230,    0,  222, 3240, 3229,  151,
+-      639, 3219,    0, 3240,  592, 3240, 3227, 3240,  226, 3240,
+-     3207,  133,  581,  344,  600, 3240, 3225,  595, 3205, 3240,
+-        0, 3240, 3223,    0, 3223,  310, 3221, 3240,    0, 3240,
+-     3220, 3240,    0, 3186, 3165, 3161,    0, 3217, 3240, 3215,
+-     3240,  449, 3215, 3213, 3240, 3185,    0, 3240, 3240, 3240,
+-
+-     3211, 3240,  438, 3240, 3240, 3240, 3210, 3240,  594, 3240,
+-     3191,  596,  197, 3240, 3240, 3208,    0, 3189,  600, 3240,
+-        0, 3240, 3206, 3240,  157, 3196,    0, 3171, 3150, 3240,
+-     3240,  463, 3240,  603,  616, 3240,  620, 3189,    0, 3240,
+-     3201, 3240,    0,    0,  357, 3240, 3200, 3143, 3240, 3189,
+-        0, 3164, 3143, 3240, 3196, 3240, 3194, 3190, 3162, 3161,
+-     3240,  583,  575,  597, 3157, 3158,  568,    0, 3155, 3145,
+-     3153,  433,  143, 3136,  588, 3151, 3135, 3153, 3139, 3147,
+-     3150, 3125, 3240, 3240, 3174,  621,    0, 3240, 3176, 3240,
+-     3240,  651, 3240, 3175,    0,  657, 3240, 3174,  625, 3136,
+-
+-        0,    0,  690,  695,  699,  718,    0, 3129,    0,  628,
+-     3240,    0,  667, 3240, 3171, 3116,  658, 3240, 3169, 3135,
+-      173,  432,  625, 3240,  358,    0, 3240, 3111,  725, 3240,
+-     3166, 3111, 3155, 3144, 3240,    0, 3240, 3129,    0, 3240,
+-        0,    0, 3162,    0,    0, 3160, 3240,    0, 3240,    0,
+-     3121, 3117,  783,    0, 3158, 3240,  662, 3157, 3155, 3155,
+-     3240,    0, 3240,  725, 3240,  811, 3240, 3240, 3240, 3240,
+-        0, 3240,  185, 3240,    0, 3240,    0, 3115, 3111,  674,
+-     3240,  700,  719, 3240,  726, 3240,    0, 3240, 3240,    0,
+-      697, 3095, 3240,  866,    0, 3112, 3108, 3149, 3240, 3144,
+-
+-     3240, 3109, 3108,    0,  686, 3097, 3097,  623, 3095, 3131,
+-     3093,  645, 3092, 3091, 3097, 3107,  636, 3083, 3097, 3085,
+-        0, 3082, 3240, 3083, 3084,  708, 3096,  718,  717, 3098,
+-      713, 3081, 3080,  895, 3122, 3240,  748,    0, 3240, 3082,
+-        0,    0,  938, 3240, 3123,  945, 3076, 3073, 3083,    0,
+-     3075,    0,  758, 3240,  766, 3240,  767, 3240,  770, 3075,
+-      705,  753,  913,  968, 1011, 1023,  739,    0, 3061,  774,
+-     3240, 3240, 3083,    0, 3072,    0,    0, 3081, 3070, 1060,
+-     3240,    0, 1119, 3094,  826,  916,  907,  913, 1101,  645,
+-     1110,  121,  914,  827, 3078, 3067,    0, 1178, 3076, 3065,
+-
+-     3059, 3058, 3070, 3075, 3066, 3073, 3062, 3069, 3056,    0,
+-     3065, 3048, 3067,    0, 3047, 3054, 3061, 3043, 3058, 3078,
+-     3047, 3059, 3054, 3052, 3051, 3042, 3046, 3048, 3049, 3038,
+-     3046, 3047,  810, 3037, 3029, 3026, 3044, 3031,  983, 3032,
+-     3031, 3024, 3036, 3031, 3024, 3033, 3032, 3018, 3030,  848,
+-     1149, 3240,  852, 1153, 1042, 3033, 3024, 3018,    0,  995,
+-        0, 3025, 1213, 1147, 1253, 3040, 1186, 1274, 3240, 3240,
+-     3014, 3022, 3024, 3008,    0, 3027, 1195,  730,  915,  933,
+-     1014, 1136, 1123, 1188, 1189, 1194, 1190, 3021, 3005, 3019,
+-     3003, 3240, 3240, 3006, 2994, 3034, 2992, 2995, 3007, 3000,
+-
+-     1259, 3006, 2991,    0,    0, 3006, 2990, 2991, 3005,    0,
+-     3023, 2988, 2996, 3020, 2983, 2978, 2992,    0, 2980, 2996,
+-     2987, 2983, 2975, 2990, 2974, 2973, 2977,    0,  813, 2988,
+-     2975, 2977, 2987, 2982, 2966, 2971, 2966, 2982, 2962, 2980,
+-     3009, 3240, 1214, 1220, 2954, 2963, 2957,    0, 1218, 1224,
+-     2983, 2985, 1286, 1298, 1252, 1004, 1009, 2968, 2980, 2952,
+-     2966, 3240, 1160, 1256, 1255, 1263, 1203, 1197,  100, 1276,
+-     1303, 1304, 1124, 1284, 2950, 2964, 2948, 2962,    0, 2947,
+-      183,    0, 2949,    0, 2980, 1279, 2942, 2957,    0, 2949,
+-     2942,    0, 2958, 2943, 2952, 2972, 2943, 2936, 2948, 2968,
+-
+-     2927, 2932, 2929,    0, 2939, 2927, 2927, 2941,    0, 2925,
+-     2927, 2923, 2940, 2924, 2924, 2919, 2932, 2936, 2930, 2929,
+-     2921, 2932, 2915, 2959, 1229, 2915, 2923, 1337, 3240, 2955,
+-     2933, 1299, 1026, 1255, 2932, 2931,    0,    0, 1299, 1315,
+-      925, 1320, 1323, 1325, 1324, 1327, 1328, 1329, 1331, 1330,
+-        0,    0,    0,    0, 2939, 2917, 2903,    0, 1323, 2906,
+-     2914, 2906, 2898, 2896, 2931, 2911, 2900, 2909, 2902, 2905,
+-     2904, 2890, 2904,    0, 2905,    0, 2885,    0, 2920,    0,
+-     2898, 2902, 2893, 2886, 2899, 2895, 2878,    0, 1341, 2882,
+-        0, 2883, 1350,    0, 1350, 3240, 1354, 3240, 2876, 3240,
+-
+-     2900, 3240, 2902, 2901, 2900, 2899, 2898, 2897, 2896, 2895,
+-     2894, 2893, 2892, 1337, 2872, 2874, 2864, 2860, 2862, 2857,
+-     2861,    0, 2855,    0, 2867, 2852, 2855, 2851, 2803,    0,
+-     2796,    0, 2796, 2776,    0,  317,    0, 2753, 2754, 2751,
+-     2728,    0,    0, 2741, 2716, 2725, 1355, 2717, 2732, 2714,
+-     2703, 2672, 2652, 2654, 1329, 2646, 1357, 3240, 2630, 2612,
+-     2597, 2596, 2578, 2574, 2573, 2572, 2569, 2550, 2545, 2552,
+-     2521, 2525, 2513, 2521, 2526, 2520, 2502,    0, 2504, 2496,
+-     2502,    0, 2469, 2447, 2448, 2420, 2427, 2430, 2410, 2410,
+-     1321, 2407, 2421, 2402, 3240, 2407, 2401, 2399, 2393, 2373,
+-
+-     2364,    0, 2384, 2378, 2359, 3240, 2364, 2360, 2373, 2350,
+-     1394, 3240, 1397, 3240, 3240, 3240, 3240, 3240, 3240, 3240,
+-     3240, 3240, 3240, 3240, 2368, 2310, 2298, 2279, 2272, 2257,
+-     2226, 2228, 2221, 2210, 2206, 2220, 2206, 2207,    0, 2192,
+-     2179, 2185, 2143,  808, 2142, 2135, 2114, 2111, 2121, 2104,
+-     2088, 2064, 3240, 2055,    0, 2036, 2035, 2047, 2048, 2036,
+-     3240, 3240, 2024, 2015, 2003, 2009, 1995, 1995, 1991, 2005,
+-     2001,    0, 1984, 1964, 1975, 1963, 1957, 1932, 1924, 1918,
+-     1883, 1881, 1878, 1886, 1891, 3240, 1876, 3240, 3240, 3240,
+-     1876, 1871, 1840, 3240, 3240, 1831, 1828, 1803, 1822, 1813,
+-
+-     1812, 1805,    0,    0, 1812,    0, 1792,    0, 1803, 1803,
+-     1784, 1794, 1759, 1737, 1723, 3240, 3240, 1708, 3240, 3240,
+-     1707, 1701, 1675, 1663,    0, 1663, 1633, 1630, 1373,    0,
+-     1350, 3240, 1369, 1368, 1353, 1356, 3240, 3240, 3240, 1360,
+-     1343, 1347, 1330, 1321, 1265, 1247,    0, 3240,  124, 3240,
+-      405,  419,  551,  585,  661,  729,  812, 3240, 3240,  911,
+-      910,    0,    0, 1013, 1100, 1108,    0, 1192, 1195,    0,
+-        0, 3240, 1408, 1426, 1444, 1462, 1480, 1498, 1516, 1534,
+-     1552, 1570, 1588, 1606, 1624, 1642, 1660, 1671, 1687, 1697,
+-     1713, 1731, 1741, 1757, 1775, 1793, 1811, 1829, 1840, 1856,
+-
+-     1867, 1883, 1901, 1919, 1932, 1943, 1959, 1977, 1995, 2013,
+-     2031, 2042, 2058, 2070, 1352, 2086, 2104, 2120, 2138, 2147,
+-     2154, 2170, 2181, 2197, 2215, 2233, 2243, 2251, 2269, 2287,
+-     2305, 2323, 2341, 2359, 2377, 2395, 2406, 2422, 2433, 2440,
+-     2456, 2469, 2480, 2496, 2514, 2532, 2550, 2561, 2577, 2589,
+-     2605, 2623, 2639, 2657, 2675, 2686, 2695, 2711, 2729, 2747,
+-     2757, 2765, 2783, 2801, 2819, 2830, 2846, 2864, 2882
++        0,   59,  117,  175,  121,  129, 3310, 3309,  234, 3302,
++      138,  144,  293,    0, 3280, 3279,  145,  152,  187,  193,
++      124,  179,  350,  353,  382,    0,  132,  153,  439,  440,
++      443,  450,  478,    0,  537,    0,  207,  211,  594,  595,
++     3308, 3314,  217, 3314, 3304,    0,  357, 3314, 3303,  151,
++      646, 3293,    0, 3314,  599, 3314, 3301, 3314,  361, 3314,
++     3281,  133,  588,  352,  607, 3314, 3299,  159, 3279, 3314,
++        0, 3314, 3297,    0, 3297,  316, 3295, 3314,    0, 3314,
++     3294, 3314,    0, 3260, 3239, 3235,    0, 3291, 3314, 3289,
++     3314,  455, 3289, 3287, 3314, 3259,    0, 3314, 3314, 3314,
++
++     3285, 3314,  444, 3314, 3314, 3314, 3284, 3314,  601, 3314,
++     3265,  603,  444, 3314, 3314, 3282,    0, 3263,  607, 3314,
++        0, 3314, 3280, 3314,  157, 3270,    0, 3245, 3224, 3314,
++     3314,  371, 3314,  467,  471, 3314,  472, 3263, 3251, 3248,
++        0, 3314, 3273, 3314,    0,    0,  199, 3314, 3272, 3215,
++     3314, 3261,    0, 3236, 3215, 3314, 3268, 3314, 3266, 3262,
++     3234, 3233, 3314,  568,  575,  590, 3229, 3230,  582,    0,
++     3227, 3217, 3225,  325,  143, 3208,  590, 3223, 3207, 3225,
++     3211, 3219, 3222, 3197, 3314, 3314, 3246,  613,    0, 3314,
++     3248, 3314, 3314,  639, 3314, 3247,    0,  643, 3314, 3246,
++
++      625, 3208,    0,    0,  667,  702,  706,  710,    0, 3201,
++        0,  635, 3314,    0,  674, 3314, 3243, 3188,  644, 3314,
++     3241, 3207,  632,  646,  681, 3314,  646,    0, 3314, 3183,
++      732, 3314, 3238, 3183, 3227, 3216, 3314,    0, 3314, 3201,
++        0, 3314,    0,    0, 3234,    0,    0, 3232, 3314,    0,
++     3314,    0, 3193, 3189,  790,    0, 3230, 3314,  737, 3229,
++     3227, 3227, 3314,    0, 3314,  726, 3314,  818, 3314, 3314,
++     3314, 3314,    0, 3314,  190, 3314,    0, 3314,    0, 3187,
++     3183,  697, 3314,  728,  744, 3314,  747, 3314, 3314, 3314,
++        0, 3314, 3314,    0,  445, 3167, 3314,  873,    0, 3184,
++
++     3180, 3221, 3314, 3216, 3314, 3181, 3180,    0,  621, 3169,
++     3169,  161, 3167, 3203, 3165,  657, 3164, 3163, 3169, 3179,
++      659, 3155, 3169, 3157,    0, 3154, 3314, 3155, 3156,  631,
++     3168,  719,  682, 3170,  588, 3153, 3152,  902, 3194, 3314,
++      746,    0, 3314, 3154,    0,    0,  756, 3314, 3195,  765,
++     3148, 3145, 3155,    0, 3147,    0,  766, 3314,  774, 3314,
++      775, 3314,  783, 3147,  827,  836,  920,  975,  926, 1018,
++      841,    0, 3133,  955, 3314, 3314, 3155,    0, 3144,    0,
++        0, 3153, 3142, 1055, 3314,    0, 1114, 3166,  920,  921,
++      736,  926,  929,  927, 1096,  914, 1105,  841, 3150, 3139,
++
++        0, 1173, 3148, 3137, 3131, 3130, 3142, 3147, 3138, 3145,
++     3134, 3141, 3128,    0, 3137, 3120, 3139,    0, 3119, 3126,
++     3133, 3115, 3130, 3150, 3119, 3131, 3126, 3124, 3123, 3114,
++     3118, 3120, 3121, 3110, 3118, 3119,   96, 3109, 3101, 3098,
++     3116, 3103,  918, 3104, 3103, 3096, 3108, 3103, 3096, 3105,
++     3104, 3090, 3102,  784, 1144, 3314,  864, 1148,  969, 3105,
++     3096, 3090,    0, 1152,    0, 3097, 1208, 1142, 1248, 3112,
++     1187, 1269, 3314, 3314, 3086, 3094, 3096, 3080,    0, 3099,
++     1177,  839, 1134, 1118, 1178, 1185, 1136, 1190, 1186, 1191,
++     1187, 3093, 3077, 3091, 3075, 3314, 3314, 3078, 3066, 3106,
++
++     3064, 3067, 3079, 3072, 1254, 3078, 3063,    0,    0, 3078,
++     3062, 3063, 3077,    0, 3095, 3060, 3068, 3092, 3055, 3050,
++     3064,    0, 3052, 3068, 3059, 3055, 3047, 3062, 3046, 3045,
++     3049,    0,  820, 3060, 3047, 3049, 3059, 3054, 3038, 3043,
++     3038, 3054, 3034, 3052, 3081, 3314, 1036, 1214, 3026, 3035,
++     3029,    0, 1156, 1218, 3055, 3057, 1281, 1293, 1020, 1198,
++     1201, 3040, 3052, 3024, 3038, 3314, 1255, 1251, 1250, 1271,
++     1253, 1249,  429, 1279,  333, 1298,  934, 1293, 3022, 3036,
++     3020, 3034,    0, 3019, 1286,    0, 3021,    0, 3052, 1294,
++     3014, 3029,    0, 3021, 3014,    0, 3030, 3015, 3024, 3044,
++
++     3015, 3008, 3020, 3040, 2999, 3004, 3001,    0, 3011, 2999,
++     2999, 3013,    0, 2997, 2999, 2995, 3012, 2996, 2996, 2991,
++     3004, 3008, 3002, 3001, 2993, 3004, 2987, 3031, 1037, 2987,
++     2995, 1333, 3314, 3027, 3005, 1250, 1209, 1288, 3004, 3003,
++        0,    0,  645, 1316, 1301, 1296, 1302, 1319, 1320, 1321,
++     1324, 1325, 1328, 1326,    0,    0,    0,    0, 3011, 2989,
++     2975,    0, 1317, 2978, 2986, 2978, 2970, 2968, 3003, 2983,
++     2972, 2981, 2974, 2977, 2976, 2962, 2976,    0, 2977,    0,
++     2957,    0, 2992,    0, 2970, 2974, 2965, 2958, 2971, 2967,
++     2950,    0, 1316, 2954,    0, 2955, 1328,    0, 1352, 3314,
++
++     1373, 3314, 2948, 3314, 2972, 3314, 2974, 2973, 2972, 2971,
++     2970, 2969, 2913, 2908, 2907, 2906, 2884, 1333, 2846, 2830,
++     2818, 2811, 2813, 2808, 2807,    0, 2801,    0, 2813, 2798,
++     2801, 2790, 2783,    0, 2738,    0, 2738, 2738,    0, 1328,
++        0, 2725, 2743, 2742, 2682,    0,    0, 2677, 2642, 2651,
++     1343, 2625, 2637, 2626, 2625, 2634, 2612, 2602, 1342, 2590,
++     1384, 3314, 2612, 2611, 2604, 2603, 2602, 2598, 2597, 2593,
++     2589, 2581, 2572, 2578, 2547, 2550, 2533, 2516, 2521, 2518,
++     2482,    0, 2487, 2486, 2489,    0, 2469, 2472, 2470, 2462,
++     2472, 2475, 2454, 2454, 1340, 2452, 2449, 2430, 3314, 2431,
++
++     2430, 2428, 2435, 2415, 2410,    0, 2427, 2427, 2405, 3314,
++     2407, 2368, 2363, 2325, 1388, 3314, 1389, 3314, 3314, 3314,
++     3314, 3314, 3314, 3314, 3314, 3314, 3314, 3314, 2328, 2287,
++     2274, 2270, 2277, 2279, 2265, 2264, 2260, 2249, 2250, 2264,
++     2231, 2226,    0, 2218, 2188, 2204, 2184, 1345, 2157, 2175,
++     2154, 2151, 2161, 2162, 2144, 2116, 3314, 2092,    0, 2090,
++     2074, 2083, 2084, 2074, 3314, 3314, 2080, 2073, 2042, 2050,
++     2036, 2036, 2028, 2042, 2041,    0, 2024, 2021, 2036, 2028,
++     2005, 1986, 1996, 1989, 1968, 1968, 1960, 1945, 1950, 3314,
++     1936, 3314, 3314, 3314, 1921, 1922, 1908, 3314, 3314, 1899,
++
++     1896, 1889, 1902, 1886, 1867, 1862,    0,    0, 1869,    0,
++     1849,    0, 1842, 1842, 1822, 1835, 1835, 1824, 1827, 3314,
++     3314, 1816, 3314, 3314, 1812, 1825, 1813, 1802,    0, 1765,
++     1741, 1720, 1734,    0, 1711, 3314, 1730, 1709, 1676, 1676,
++     3314, 3314, 3314, 1686, 1673, 1657, 1647, 1651,   85,  122,
++        0, 3314,  174, 3314,  612,  667,  693,  722,  912,  914,
++      964, 3314, 3314, 1004, 1090,    0,    0, 1239, 1317, 1327,
++        0, 1352, 1362,    0,    0, 3314, 1401, 1420, 1439, 1458,
++     1477, 1496, 1515, 1534, 1553, 1572, 1591, 1610, 1629, 1648,
++     1667, 1679, 1696, 1707, 1724, 1743, 1754, 1771, 1790, 1809,
++
++     1828, 1847, 1859, 1876, 1888, 1905, 1924, 1943, 1957, 1969,
++     1986, 2005, 2024, 2043, 2062, 2074, 2091, 2104, 1383, 2121,
++     2140, 2157, 2176, 2186, 2194, 2211, 2223, 2240, 2259, 2278,
++     2289, 2298, 2317, 2336, 2355, 2374, 2393, 2412, 2431, 2450,
++     2462, 2479, 2491, 2499, 2516, 2530, 2542, 2559, 2578, 2597,
++     2616, 2628, 2645, 2658, 2675, 2694, 2711, 2730, 2749, 2761,
++     2771, 2788, 2807, 2826, 2837, 2846, 2865, 2884, 2903, 2915,
++     2932, 2951, 2970
+     } ;
+ 
+-static yyconst flex_int16_t yy_def[1070] =
++static yyconst flex_int16_t yy_def[1074] =
+     {   0,
+-      972,  972,  973,  973,  974,  975,  976,  976,  972,    9,
+-      977,  977,  972,   13,  978,  978,  979,  979,  980,  980,
+-      981,  981,  982,  982,  972,   25,  983,  983,  984,  984,
+-      985,  985,  972,   33,  972,   35,  986,  986,  987,  987,
+-      972,  972,  972,  972,  972,  988,  972,  972,  972,  972,
+-      989,  972,  990,  972,  972,  972,  972,  972,  972,  972,
+-      972,  991,  992,  993,  972,  972,  972,  972,  972,  972,
+-      994,  972,  994,  995,  996,  995,  997,  972,  998,  972,
+-      998,  972,  999,  999,  999,  998, 1000,  972,  972,  972,
+-      972,  972,  972,  972,  972,  972, 1001,  972,  972,  972,
+-
+-      972,  972,  972,  972,  972,  972,  972,  972,  992,  972,
+-      972,  992, 1002,  972,  972,  972, 1003,  972,  992,  972,
+-     1004,  972, 1004,  972, 1005,  972, 1006, 1006, 1006,  972,
+-      972, 1007,  972, 1007, 1008,  972, 1008,  972, 1009,  972,
+-     1009,  972, 1010, 1011, 1011,  972, 1011, 1011,  972, 1011,
+-     1012, 1012, 1012,  972,  972,  972,  972, 1013,  972,  972,
+-      972, 1014, 1014, 1014, 1014, 1014, 1014, 1014, 1014, 1014,
+-     1014, 1014, 1015, 1014, 1014, 1014, 1014, 1014, 1014, 1014,
+-     1014, 1014,  972,  972, 1016,  972, 1017,  972,  972,  972,
+-      972,  972,  972,  972,  988,  972,  972,  972,  972,  972,
+-
+-     1018, 1019,  972,  972,  972,  972, 1020, 1018, 1021, 1022,
+-      972, 1023,  972,  972,  972,  972, 1024,  972,  972,  972,
+-     1025, 1025, 1026,  972,  972, 1027,  972, 1028,  972,  972,
+-      972,  972,  972,  972,  972, 1029,  972,  972, 1030,  972,
+-     1031, 1032, 1032, 1033, 1034, 1035,  972, 1036,  972, 1037,
+-     1037, 1037,  972, 1038,  972,  972,  972,  972,  972,  972,
+-      972, 1039,  972,  972,  972, 1040,  972,  972,  972,  972,
+-     1041,  972, 1042,  972, 1042,  972, 1043, 1043, 1043, 1044,
+-      972, 1044, 1045,  972, 1045,  972, 1046,  972,  972, 1047,
+-     1047, 1047,  972,  972, 1048, 1048, 1048,  972,  972, 1049,
+-
+-      972,  972,  972, 1050, 1050, 1050, 1050, 1050, 1050, 1050,
+-     1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050,
+-     1050, 1050,  972, 1050, 1050, 1050, 1050, 1050, 1050, 1050,
+-     1050, 1050, 1050, 1050, 1051,  972,  972, 1052,  972,  972,
+-     1053, 1054, 1055,  972,  972,  972,  972,  972,  972, 1056,
+-     1053, 1057, 1058,  972, 1058,  972, 1059,  972, 1059,  972,
+-     1060, 1060, 1060,  972, 1060, 1060,  972, 1061, 1062,  972,
+-      972,  972,  972, 1063,  972, 1064, 1065, 1066, 1066,  972,
+-      972,  380,  380, 1040, 1040, 1040, 1040, 1040, 1040, 1040,
+-     1040, 1040, 1040, 1040, 1043, 1043,  294,  294, 1048, 1048,
+-
+-      972,  972, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050,
+-     1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050,
+-     1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050,
+-     1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050,  972, 1050,
+-     1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050,  972, 1055,
+-     1055,  972, 1055, 1055,  972,  972,  972,  972, 1056, 1067,
+-     1057,  972,  364, 1060,  366,  364, 1060,  366,  972,  972,
+-      972,  972, 1066, 1066,  383,  972, 1040, 1040, 1040, 1040,
+-     1040, 1040, 1040, 1040, 1040, 1040, 1040, 1043, 1043, 1048,
+-     1048,  972,  972, 1050, 1050, 1050, 1050, 1050, 1050, 1050,
+-
+-     1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050,
+-     1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050,
+-     1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050,  972,  972,
+-      972, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050,
+-      972,  972, 1055, 1055,  972,  972,  972, 1067, 1067, 1067,
+-      972,  463, 1060,  366, 1060, 1060, 1060,  972,  972, 1066,
+-     1066,  972, 1040, 1040, 1040, 1040, 1040, 1040, 1040, 1040,
+-     1040, 1040, 1040, 1040, 1043, 1043, 1048, 1048, 1050, 1050,
+-     1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050,
+-     1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050,
+-
+-     1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050,
+-      972,  972,  972,  972, 1050, 1050, 1050, 1050, 1050, 1050,
+-     1050, 1050, 1050,  972, 1068,  972,  972, 1067,  972, 1067,
+-      972, 1060, 1060, 1060,  972,  972, 1066, 1066, 1040, 1040,
+-     1040, 1040, 1040, 1040, 1040, 1040, 1040, 1040, 1040, 1040,
+-     1043, 1043, 1048, 1048, 1050, 1050, 1050, 1050, 1050, 1050,
+-     1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050,
+-     1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050,
+-     1050,  972,  972,  972,  972, 1050, 1050, 1050,  972, 1050,
+-     1050, 1050,  972, 1050, 1068,  972, 1068,  972,  972,  972,
+-
+-      972,  972, 1040, 1040, 1040, 1040, 1040, 1040, 1040, 1040,
+-     1040, 1040, 1040, 1040, 1050, 1050, 1050, 1050, 1050, 1050,
+-     1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050,
+-     1050, 1050, 1050, 1050, 1050, 1050, 1050,  972,  972,  972,
+-      972, 1050, 1050,  972,  972,  972,  972,  972,  972, 1050,
+-     1050,  972,  972,  972,  972,  972, 1069,  972,  972,  972,
+-      972,  972,  972,  972,  972,  972,  972,  972,  972, 1040,
+-     1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050,
+-     1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050,  972,  972,
+-      972,  972,  972,  972,  972,  972,  972,  972,  972,  972,
+-
+-      972, 1050, 1050,  972,  972,  972,  972,  972,  972,  972,
+-     1069,  972, 1069,  972,  972,  972,  972,  972,  972,  972,
+-      972,  972,  972,  972,  972, 1050, 1050, 1050, 1050, 1050,
+-     1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050,
+-     1050,  972,  972,  972,  972,  972,  972,  972,  972,  972,
+-      972,  972,  972,  972, 1050,  972,  972,  972,  972,  972,
+-      972,  972, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050,
+-     1050, 1050, 1050, 1050, 1050, 1050, 1050,  972,  972,  972,
+-      972,  972,  972,  972,  972,  972,  972,  972,  972,  972,
+-      972,  972,  972,  972,  972, 1050, 1050, 1050, 1050, 1050,
+-
+-     1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050,  972,
+-      972,  972,  972,  972,  972,  972,  972,  972,  972,  972,
+-      972, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050,
+-     1050,  972,  972,  972,  972,  972,  972,  972,  972, 1050,
+-     1050, 1050, 1050, 1050, 1050, 1050, 1050,  972,  972,  972,
+-      972, 1050, 1050, 1050, 1050, 1050, 1050,  972,  972, 1050,
+-     1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050,
+-     1050,    0,  972,  972,  972,  972,  972,  972,  972,  972,
+-      972,  972,  972,  972,  972,  972,  972,  972,  972,  972,
+-      972,  972,  972,  972,  972,  972,  972,  972,  972,  972,
+-
+-      972,  972,  972,  972,  972,  972,  972,  972,  972,  972,
+-      972,  972,  972,  972,  972,  972,  972,  972,  972,  972,
+-      972,  972,  972,  972,  972,  972,  972,  972,  972,  972,
+-      972,  972,  972,  972,  972,  972,  972,  972,  972,  972,
+-      972,  972,  972,  972,  972,  972,  972,  972,  972,  972,
+-      972,  972,  972,  972,  972,  972,  972,  972,  972,  972,
+-      972,  972,  972,  972,  972,  972,  972,  972,  972
++      976,  976,  977,  977,  978,  979,  980,  980,  976,    9,
++      981,  981,  976,   13,  982,  982,  983,  983,  984,  984,
++      985,  985,  986,  986,  976,   25,  987,  987,  988,  988,
++      989,  989,  976,   33,  976,   35,  990,  990,  991,  991,
++      976,  976,  976,  976,  976,  992,  976,  976,  976,  976,
++      993,  976,  994,  976,  976,  976,  976,  976,  976,  976,
++      976,  995,  996,  997,  976,  976,  976,  976,  976,  976,
++      998,  976,  998,  999, 1000,  999, 1001,  976, 1002,  976,
++     1002,  976, 1003, 1003, 1003, 1002, 1004,  976,  976,  976,
++      976,  976,  976,  976,  976,  976, 1005,  976,  976,  976,
++
++      976,  976,  976,  976,  976,  976,  976,  976,  996,  976,
++      976,  996, 1006,  976,  976,  976, 1007,  976,  996,  976,
++     1008,  976, 1008,  976, 1009,  976, 1010, 1010, 1010,  976,
++      976, 1011,  976, 1011, 1012,  976, 1012,  976,  976,  976,
++     1013,  976, 1013,  976, 1014, 1015, 1015,  976, 1015, 1015,
++      976, 1015, 1016, 1016, 1016,  976,  976,  976,  976, 1017,
++      976,  976,  976, 1018, 1018, 1018, 1018, 1018, 1018, 1018,
++     1018, 1018, 1018, 1018, 1019, 1018, 1018, 1018, 1018, 1018,
++     1018, 1018, 1018, 1018,  976,  976, 1020,  976, 1021,  976,
++      976,  976,  976,  976,  976,  976,  992,  976,  976,  976,
++
++      976,  976, 1022, 1023,  976,  976,  976,  976, 1024, 1022,
++     1025, 1026,  976, 1027,  976,  976,  976,  976, 1028,  976,
++      976,  976, 1029, 1029, 1030,  976,  976, 1031,  976, 1032,
++      976,  976,  976,  976,  976,  976,  976, 1033,  976,  976,
++     1034,  976, 1035, 1036, 1036, 1037, 1038, 1039,  976, 1040,
++      976, 1041, 1041, 1041,  976, 1042,  976,  976,  976,  976,
++      976,  976,  976, 1043,  976,  976,  976, 1044,  976,  976,
++      976,  976, 1045,  976, 1046,  976, 1046,  976, 1047, 1047,
++     1047, 1048,  976, 1048, 1049,  976, 1049,  976,  976,  976,
++     1050,  976,  976, 1051, 1051, 1051,  976,  976, 1052, 1052,
++
++     1052,  976,  976, 1053,  976,  976,  976, 1054, 1054, 1054,
++     1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054,
++     1054, 1054, 1054, 1054, 1054, 1054,  976, 1054, 1054, 1054,
++     1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1055,  976,
++      976, 1056,  976,  976, 1057, 1058, 1059,  976,  976,  976,
++      976,  976,  976, 1060, 1057, 1061, 1062,  976, 1062,  976,
++     1063,  976, 1063,  976, 1064, 1064, 1064,  976, 1064, 1064,
++      976, 1065, 1066,  976,  976,  976,  976, 1067,  976, 1068,
++     1069, 1070, 1070,  976,  976,  384,  384, 1044, 1044, 1044,
++     1044, 1044, 1044, 1044, 1044, 1044, 1044, 1044, 1047, 1047,
++
++      298,  298, 1052, 1052,  976,  976, 1054, 1054, 1054, 1054,
++     1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054,
++     1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054,
++     1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054,
++     1054, 1054,  976, 1054, 1054, 1054, 1054, 1054, 1054, 1054,
++     1054, 1054,  976, 1059, 1059,  976, 1059, 1059,  976,  976,
++      976,  976, 1060, 1071, 1061,  976,  368, 1064,  370,  368,
++     1064,  370,  976,  976,  976,  976, 1070, 1070,  387,  976,
++     1044, 1044, 1044, 1044, 1044, 1044, 1044, 1044, 1044, 1044,
++     1044, 1047, 1047, 1052, 1052,  976,  976, 1054, 1054, 1054,
++
++     1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054,
++     1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054,
++     1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054,
++     1054, 1054,  976,  976,  976, 1054, 1054, 1054, 1054, 1054,
++     1054, 1054, 1054, 1054,  976,  976, 1059, 1059,  976,  976,
++      976, 1071, 1071, 1071,  976,  467, 1064,  370, 1064, 1064,
++     1064,  976,  976, 1070, 1070,  976, 1044, 1044, 1044, 1044,
++     1044, 1044, 1044, 1044, 1044, 1044, 1044, 1044, 1047, 1047,
++     1052, 1052, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054,
++     1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054,
++
++     1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054,
++     1054, 1054, 1054, 1054,  976,  976,  976,  976, 1054, 1054,
++     1054, 1054, 1054, 1054, 1054, 1054, 1054,  976, 1072,  976,
++      976, 1071,  976, 1071,  976, 1064, 1064, 1064,  976,  976,
++     1070, 1070, 1044, 1044, 1044, 1044, 1044, 1044, 1044, 1044,
++     1044, 1044, 1044, 1044, 1047, 1047, 1052, 1052, 1054, 1054,
++     1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054,
++     1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054,
++     1054, 1054, 1054, 1054, 1054,  976,  976,  976,  976, 1054,
++     1054, 1054,  976, 1054, 1054, 1054,  976, 1054, 1072,  976,
++
++     1072,  976,  976,  976,  976,  976, 1044, 1044, 1044, 1044,
++     1044, 1044, 1044, 1044, 1044, 1044, 1044, 1044, 1054, 1054,
++     1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054,
++     1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054,
++     1054,  976,  976,  976,  976, 1054, 1054,  976,  976,  976,
++      976,  976,  976, 1054, 1054,  976,  976,  976,  976,  976,
++     1073,  976,  976,  976,  976,  976,  976,  976,  976,  976,
++      976,  976,  976, 1044, 1054, 1054, 1054, 1054, 1054, 1054,
++     1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054,
++     1054, 1054,  976,  976,  976,  976,  976,  976,  976,  976,
++
++      976,  976,  976,  976,  976, 1054, 1054,  976,  976,  976,
++      976,  976,  976,  976, 1073,  976, 1073,  976,  976,  976,
++      976,  976,  976,  976,  976,  976,  976,  976,  976, 1054,
++     1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054,
++     1054, 1054, 1054, 1054, 1054,  976,  976,  976,  976,  976,
++      976,  976,  976,  976,  976,  976,  976,  976, 1054,  976,
++      976,  976,  976,  976,  976,  976, 1054, 1054, 1054, 1054,
++     1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054,
++     1054,  976,  976,  976,  976,  976,  976,  976,  976,  976,
++      976,  976,  976,  976,  976,  976,  976,  976,  976, 1054,
++
++     1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054,
++     1054, 1054, 1054,  976,  976,  976,  976,  976,  976,  976,
++      976,  976,  976,  976,  976, 1054, 1054, 1054, 1054, 1054,
++     1054, 1054, 1054, 1054, 1054,  976,  976,  976,  976,  976,
++      976,  976,  976, 1054, 1054, 1054, 1054, 1054, 1054, 1054,
++     1054,  976,  976,  976,  976, 1054, 1054, 1054, 1054, 1054,
++     1054,  976,  976, 1054, 1054, 1054, 1054, 1054, 1054, 1054,
++     1054, 1054, 1054, 1054, 1054,    0,  976,  976,  976,  976,
++      976,  976,  976,  976,  976,  976,  976,  976,  976,  976,
++      976,  976,  976,  976,  976,  976,  976,  976,  976,  976,
++
++      976,  976,  976,  976,  976,  976,  976,  976,  976,  976,
++      976,  976,  976,  976,  976,  976,  976,  976,  976,  976,
++      976,  976,  976,  976,  976,  976,  976,  976,  976,  976,
++      976,  976,  976,  976,  976,  976,  976,  976,  976,  976,
++      976,  976,  976,  976,  976,  976,  976,  976,  976,  976,
++      976,  976,  976,  976,  976,  976,  976,  976,  976,  976,
++      976,  976,  976,  976,  976,  976,  976,  976,  976,  976,
++      976,  976,  976
+     } ;
+ 
+-static yyconst flex_int16_t yy_nxt[3300] =
++static yyconst flex_int16_t yy_nxt[3374] =
+     {   0,
+        42,   43,   44,   42,   45,   42,   42,   42,   42,   42,
+        42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
+@@ -770,19 +772,19 @@
+ 
+        53,   53,   53,   53,   53,   53,   53,   53,   53,   53,
+        53,   53,   53,   53,   53,   42,   42,   42,   55,   56,
+-      476,   57,   58,   72,   59,   73,   42,   60,   60,   60,
+-       75,   72,   60,   73,  133,  645,  134,   76,   61,   88,
+-       89,  476,   90,   62,   63,   88,   89,  100,   90,  101,
+-      111,  112,  199,  113,  100,  133,  101,  134,  102,  222,
+-      223,  103,  103,  103,  103,  102,  274,  485,  103,  103,
+-      103,  103,  958,   64,   60,   60,   65,   66,  322,   67,
+-       58,   42,   59,   68,  275,   60,   60,   60,  323,  106,
+-       60,  107,  108,  200,  274,  106,   69,  107,  108,  362,
+-
+-      363,   62,   63,  104,   70,  111,  112,  136,  113,  137,
+-      104,  268,  275,  136,  109,  137,  138,  656,  192,  193,
+-      109,  194,  138,  196,  197,  268,  198,  218,  218,  657,
+-      219,   64,   60,   60,   79,   79,   80,   79,   81,   79,
++      726,   57,   58,   72,   59,   73,   42,   60,   60,   60,
++       75,   72,   60,   73,  133,  526,  134,   76,   61,   88,
++       89,  527,   90,   62,   63,   88,   89,  100,   90,  101,
++      111,  112,  201,  113,  100,  133,  101,  134,  102,  224,
++      225,  103,  103,  103,  103,  102,  276,  238,  103,  103,
++      103,  103,  961,   64,   60,   60,   65,   66,  326,   67,
++       58,   42,   59,   68,  277,   60,   60,   60,  327,  106,
++       60,  107,  108,  202,  411,  106,   69,  107,  108,  276,
++
++      295,   62,   63,  104,   70,  111,  112,  296,  113,  186,
++      104,  412,  187,  186,  109,  239,  187,  277,  194,  195,
++      109,  196,  962,  188,  188,  188,  188,  188,  188,  188,
++      188,   64,   60,   60,   79,   79,   80,   79,   81,   79,
+        79,   79,   79,   79,   79,   82,   79,   79,   79,   79,
+        79,   79,   79,   79,   79,   79,   79,   79,   83,   83,
+        79,   79,   79,   79,   83,   83,   83,   83,   83,   83,
+@@ -795,9 +797,9 @@
+        91,   91,   91,   97,   97,   97,   97,   97,   97,   97,
+        97,   97,   97,   97,   97,   97,   97,   97,   97,   97,
+        97,   97,   97,   97,   97,   97,   97,   97,   97,   91,
+-       91,   91,  115,  787,  116,  115,  184,  116,  291,  185,
+-      227,  227,  227,  227,  117,  292,  244,  117,  245,  788,
+-      186,  186,  186,  186,  367,  367,  118,  119,  120,  118,
++       91,   91,  115,  480,  116,  115,  323,  116,  198,  199,
++      324,  200,  220,  220,  117,  221,  651,  117,  229,  229,
++      229,  229,  246,  283,  247,  284,  118,  119,  120,  118,
+       119,  120,  121,  121,  122,  121,  123,  124,  121,  121,
+       121,  125,  121,  121,  121,  121,  121,  126,  121,  121,
+ 
+@@ -805,324 +807,332 @@
+       121,  121,  127,  127,  127,  127,  127,  127,  127,  127,
+       127,  127,  127,  127,  127,  127,  127,  127,  127,  127,
+       128,  127,  127,  127,  127,  127,  127,  129,  130,  121,
+-      131,  140,  959,  141,  142,  140,  184,  141,  142,  185,
+-      257,  258,  364,  259,  264,  264,  264,  264,  362,  363,
+-      186,  186,  186,  186,  319,  281,  143,  282,  320,  960,
+-      143,  144,  145,  146,  144,  147,  144,  144,  144,  148,
+-      144,  144,  149,  144,  144,  144,  150,  144,  144,  144,
+-      144,  144,  144,  144,  144,  151,  151,  144,  144,  144,
+-
+-      144,  151,  151,  151,  151,  151,  151,  151,  151,  151,
+-      151,  151,  151,  151,  151,  151,  151,  151,  151,  152,
+-      151,  151,  151,  151,  151,  151,  153,  144,  144,  144,
+-      154,  155,  156,  154,  157,  158,  154,  154,  154,  154,
+-      154,  154,  154,  154,  154,  154,  154,  159,  160,  154,
+-      154,  154,  161,  154,  154,  154,  154,  154,  154,  154,
+-      154,  162,  163,  164,  165,  166,  167,  168,  169,  170,
+-      168,  168,  171,  172,  173,  174,  175,  168,  176,  177,
+-      178,  179,  180,  181,  168,  182,  154,  154,  154,  188,
+-      188,  189,  189,  213,  214,  961,  215,  225,  225,  314,
+-
+-      216,  229,  230,  236,  231,  281,  308,  282,  232,  310,
+-      225,  225,  225,  225,  309,  233,  225,  225,  284,  315,
+-      285,  234,  284,  325,  285,  305,  199,  306,  311,  235,
+-      354,  307,  355,  326,  962,  226,  327,  337,  337,  337,
+-      337,  365,  365,  190,  190,  191,  191,  202,  226,  217,
+-      226,  237,  192,  193,  226,  194,  407,  217,  196,  197,
+-      358,  198,  359,  257,  258,  476,  259,  200,  213,  214,
+-      203,  215,  204,  408,  204,  216,  281,  412,  282,  366,
+-      204,  413,  418,  204,  205,  206,  419,  204,  207,  208,
+-      482,  343,  344,  209,  345,  210,  343,  344,  291,  345,
+-
+-      343,  344,  281,  345,  282,  292,  346,  346,  346,  346,
+-      963,  346,  346,  346,  346,  346,  346,  346,  346,  343,
+-      344,  284,  345,  285,  217,  403,  229,  230,  284,  231,
+-      285,  362,  363,  232,  346,  346,  346,  346,  347,  404,
+-      233,  264,  264,  264,  264,  348,  234,  426,  432,  429,
+-      476,  433,  435,  430,  235,  224,  224,  427,  431,  436,
+-      354,  565,  355,  349,  337,  337,  337,  337,  354,  358,
+-      355,  359,  358,  463,  359,  470,  470,  470,  470,  362,
+-      363,  964,  217,  380,  380,  381,  380,  382,  380,  380,
+-      380,  380,  380,  380,  383,  380,  380,  380,  380,  380,
+-
+-      380,  380,  380,  380,  380,  380,  380,  383,  383,  380,
+-      380,  380,  380,  383,  383,  383,  383,  383,  383,  383,
+-      383,  383,  383,  383,  383,  383,  383,  383,  383,  383,
+-      383,  383,  383,  383,  383,  383,  383,  383,  383,  380,
+-      380,  380,  385,  386,  387,  388,  476,  476,  389,  522,
+-      542,  965,  543,  390,  452,  523,  543,  391,  611,  880,
+-      392,  487,  393,  881,  612,  394,  397,  397,  477,  397,
+-      397,  397,  397,  397,  397,  397,  397,  398,  397,  397,
+-      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
+-      398,  398,  397,  397,  397,  397,  398,  398,  398,  398,
+-
+-      398,  398,  398,  398,  398,  398,  398,  398,  398,  398,
+-      398,  398,  398,  398,  398,  398,  398,  398,  398,  398,
+-      398,  398,  397,  397,  397,  439,  440,  476,  441,  464,
+-      464,  442,  443,  476,  476,  476,  476,  444,  445,  451,
+-      452,  361,  453,  446,  447,  476,  455,  344,  448,  345,
+-      966,  479,  480,  476,  454,  454,  454,  454,  478,  967,
+-      486,  346,  346,  346,  346,  566,  705,  465,  361,  361,
+-      567,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+-      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+-      361,  361,  466,  466,  362,  363,  549,  361,  361,  466,
+-
+-      466,  466,  466,  466,  466,  466,  466,  466,  466,  466,
+-      466,  466,  466,  466,  466,  466,  466,  466,  466,  466,
+-      466,  466,  466,  466,  361,  361,  361,  467,  467,  529,
+-      362,  363,  530,  531,  476,  362,  363,  362,  363,  468,
+-      468,  468,  468,  455,  344,  568,  345,  468,  778,  362,
+-      363,  550,  362,  363,  468,  468,  468,  468,  468,  468,
+-      380,  380,  381,  380,  382,  380,  380,  380,  380,  380,
+-      380,  383,  380,  380,  380,  380,  380,  380,  380,  380,
+-      380,  380,  380,  380,  383,  383,  380,  380,  380,  380,
+-      383,  383,  383,  383,  383,  383,  383,  383,  383,  383,
+-
+-      383,  383,  383,  383,  383,  383,  383,  383,  383,  383,
+-      383,  383,  383,  383,  383,  383,  380,  380,  380,  383,
+-      383,  476,  383,  475,  383,  383,  383,  383,  383,  383,
+-      476,  383,  383,  383,  383,  383,  383,  383,  383,  383,
+-      383,  383,  383,  476,  476,  383,  383,  383,  383,  481,
+-      451,  452,  968,  453,  544,  452,  476,  453,  483,  649,
+-      969,  484,  570,  553,  553,  454,  454,  454,  454,  454,
+-      454,  454,  454,  362,  363,  383,  383,  383,  398,  398,
+-      476,  398,  398,  398,  398,  398,  398,  398,  398,  569,
+-      398,  398,  398,  398,  398,  398,  398,  398,  398,  398,
+-
+-      398,  398,  556,  556,  398,  398,  398,  398,  476,  476,
+-      476,  639,  362,  363,  476,  476,  542,  476,  543,  549,
+-      572,  544,  452,  476,  453,  628,  629,  970,  630,  574,
+-      971,  696,  571,  697,  398,  398,  398,  552,  552,  563,
+-      573,  564,  643,  644,  552,  552,  552,  552,  552,  552,
+-      552,  552,  552,  552,  552,  552,  552,  552,  552,  552,
+-      552,  552,  552,  552,  552,  552,  552,  552,  552,  554,
+-      554,  554,  554,  586,  550,  476,  476,  554,  362,  363,
+-      221,  362,  363,  476,  554,  554,  554,  554,  554,  554,
+-      557,  557,  557,  557,  640,  587,  476,  957,  557,  641,
+-
+-      722,  588,  633,  633,  476,  557,  557,  557,  557,  557,
+-      557,  642,  362,  363,  634,  634,  634,  634,  660,  476,
+-      646,  650,  634,  476,  476,  362,  363,  361,  661,  634,
+-      634,  634,  634,  634,  634,  476,  647,  648,  628,  629,
+-      476,  630,  703,  476,  476,  476,  704,  476,  476,  476,
+-      476,  476,  696,  844,  697,  718,  696,  476,  697,  812,
+-      956,  813,  706,  708,  712,  719,  321,  321,  807,  714,
+-      845,  808,  709,  707,  955,  744,  745,  710,  711,  713,
+-      746,  809,  954,  747,  752,  753,  748,  770,  953,  754,
+-      796,  749,  755,  952,  797,  756,  812,  798,  813,  812,
++      131,  136,  136,  137,  137,  142,  295,  143,  144,  480,
++      138,  138,  142,  296,  143,  144,  259,  260,  270,  261,
++      266,  266,  266,  266,  649,  139,  139,  140,  140,  283,
++      145,  284,  270,  286,  286,  287,  287,  145,  146,  147,
++      148,  146,  149,  146,  146,  146,  150,  146,  146,  151,
++      146,  146,  146,  152,  146,  146,  146,  146,  146,  146,
++
++      146,  146,  153,  153,  146,  146,  146,  146,  153,  153,
++      153,  153,  153,  153,  153,  153,  153,  153,  153,  153,
++      153,  153,  153,  153,  153,  153,  154,  153,  153,  153,
++      153,  153,  153,  155,  146,  146,  146,  156,  157,  158,
++      156,  159,  160,  156,  156,  156,  156,  156,  156,  156,
++      156,  156,  156,  156,  161,  162,  156,  156,  156,  163,
++      156,  156,  156,  156,  156,  156,  156,  156,  164,  165,
++      166,  167,  168,  169,  170,  171,  172,  170,  170,  173,
++      174,  175,  176,  177,  170,  178,  179,  180,  181,  182,
++      183,  170,  184,  156,  156,  156,  190,  190,  191,  191,
++
++      215,  216,  314,  217,  227,  227,  312,  218,  231,  232,
++      309,  233,  310,  318,  313,  234,  311,  227,  227,  227,
++      227,  315,  235,  227,  227,  329,  201,  439,  236,  341,
++      341,  341,  341,  319,  440,  330,  237,  358,  331,  359,
++      194,  195,  228,  196,  198,  199,  362,  200,  363,  963,
++      192,  192,  193,  193,  204,  228,  219,  228,  366,  367,
++      407,  228,  371,  371,  219,  480,  368,  202,  347,  348,
++      430,  349,  366,  367,  408,  215,  216,  205,  217,  206,
++      431,  206,  218,  350,  350,  350,  350,  206,  707,  416,
++      206,  207,  208,  417,  206,  209,  210,  369,  369,  283,
++
++      211,  284,  212,  347,  348,  422,  349,  347,  348,  423,
++      349,  347,  348,  436,  349,  351,  437,  964,  350,  350,
++      350,  350,  350,  350,  350,  350,  350,  350,  350,  350,
++      283,  219,  284,  231,  232,  370,  233,  965,  259,  260,
++      234,  261,  266,  266,  266,  266,  286,  235,  287,  286,
++      433,  287,  352,  236,  434,  353,  480,  455,  456,  435,
++      457,  237,  341,  341,  341,  341,  459,  348,  358,  349,
++      359,  966,  458,  458,  458,  458,  358,  362,  359,  363,
++      483,  350,  350,  350,  350,  362,  546,  363,  547,  219,
++      384,  384,  385,  384,  386,  384,  384,  384,  384,  384,
++
++      384,  387,  384,  384,  384,  384,  384,  384,  384,  384,
++      384,  384,  384,  384,  387,  387,  384,  384,  384,  384,
++      387,  387,  387,  387,  387,  387,  387,  387,  387,  387,
++      387,  387,  387,  387,  387,  387,  387,  387,  387,  387,
++      387,  387,  387,  387,  387,  387,  384,  384,  384,  389,
++      390,  391,  392,  366,  367,  393,  467,  226,  226,  480,
++      394,  480,  366,  367,  395,  615,  456,  396,  547,  397,
++      569,  616,  398,  401,  401,  491,  401,  401,  401,  401,
++      401,  401,  401,  401,  402,  401,  401,  401,  401,  401,
++      401,  401,  401,  401,  401,  401,  401,  402,  402,  401,
++
++      401,  401,  401,  402,  402,  402,  402,  402,  402,  402,
++      402,  402,  402,  402,  402,  402,  402,  402,  402,  402,
++      402,  402,  402,  402,  402,  402,  402,  402,  402,  401,
++      401,  401,  443,  444,  480,  445,  468,  468,  446,  447,
++      480,  480,  471,  471,  448,  449,  480,  480,  365,  480,
++      450,  451,  366,  367,  480,  452,  474,  474,  474,  474,
++      489,  967,  481,  482,  533,  484,  968,  534,  535,  653,
++      459,  348,  486,  349,  469,  365,  365,  485,  365,  365,
++      365,  365,  365,  365,  365,  365,  365,  365,  365,  365,
++      365,  365,  365,  365,  365,  365,  365,  365,  365,  470,
++
++      470,  366,  367,  969,  365,  365,  470,  470,  470,  470,
++      470,  470,  470,  470,  470,  470,  470,  470,  470,  470,
++      470,  470,  470,  470,  470,  470,  470,  470,  470,  470,
++      470,  365,  365,  365,  472,  472,  472,  472,  546,  700,
++      547,  701,  472,  970,  366,  367,  366,  367,  223,  472,
++      472,  472,  472,  472,  472,  384,  384,  385,  384,  386,
++      384,  384,  384,  384,  384,  384,  387,  384,  384,  384,
++      384,  384,  384,  384,  384,  384,  384,  384,  384,  387,
++      387,  384,  384,  384,  384,  387,  387,  387,  387,  387,
++      387,  387,  387,  387,  387,  387,  387,  387,  387,  387,
++
++      387,  387,  387,  387,  387,  387,  387,  387,  387,  387,
++      387,  384,  384,  384,  387,  387,  480,  387,  479,  387,
++      387,  387,  387,  387,  387,  480,  387,  387,  387,  387,
++      387,  387,  387,  387,  387,  387,  387,  387,  480,  971,
++      387,  387,  387,  387,  487,  455,  456,  488,  457,  548,
++      456,  490,  457,  553,  480,  571,  480,  553,  557,  557,
++      458,  458,  458,  458,  458,  458,  458,  458,  366,  367,
++      387,  387,  387,  402,  402,  574,  402,  402,  402,  402,
++      402,  402,  402,  402,  570,  402,  402,  402,  402,  402,
++      402,  402,  402,  402,  402,  402,  402,  480,  480,  402,
++
++      402,  402,  402,  560,  560,  480,  480,  480,  554,  572,
++      480,  480,  554,  366,  367,  548,  456,  576,  457,  632,
++      633,  567,  634,  568,  366,  367,  578,  366,  367,  402,
++      402,  402,  556,  556,  575,  366,  367,  577,  573,  556,
++      556,  556,  556,  556,  556,  556,  556,  556,  556,  556,
++      556,  556,  556,  556,  556,  556,  556,  556,  556,  556,
++      556,  556,  556,  556,  558,  558,  558,  558,  590,  480,
++      480,  480,  558,  480,  782,  480,  366,  367,  365,  558,
++      558,  558,  558,  558,  558,  561,  561,  561,  561,  644,
++      591,  480,  647,  561,  645,  648,  592,  637,  637,  480,
++
++      561,  561,  561,  561,  561,  561,  643,  366,  367,  638,
++      638,  638,  638,  480,  366,  367,  480,  638,  480,  646,
++      660,  480,  480,  650,  638,  638,  638,  638,  638,  638,
++      654,  652,  661,  664,  632,  633,  480,  634,  710,  480,
++      480,  480,  709,  665,  480,  480,  480,  708,  480,  722,
++      748,  749,  711,  480,  700,  750,  701,  712,  751,  723,
++      716,  752,  756,  757,  791,  718,  753,  758,  713,  972,
++      759,  714,  848,  760,  715,  700,  717,  701,  800,  973,
++      792,  811,  801,  774,  812,  802,  816,  974,  817,  849,
++      816,  816,  817,  817,  813,  803,  884,  975,  325,  325,
+ 
+-      951,  813,  950,  949,  948,  947,  946,  799,   54,   54,
++      885,   54,   54,   54,   54,   54,   54,   54,   54,   54,
+        54,   54,   54,   54,   54,   54,   54,   54,   54,   54,
+-       54,   54,   54,   54,   54,   54,   71,   71,   71,   71,
+        71,   71,   71,   71,   71,   71,   71,   71,   71,   71,
+-       71,   71,   71,   71,   74,   74,   74,   74,   74,   74,
++       71,   71,   71,   71,   71,   71,   71,   71,   71,   74,
+        74,   74,   74,   74,   74,   74,   74,   74,   74,   74,
+-       74,   74,   77,   77,   77,   77,   77,   77,   77,   77,
++       74,   74,   74,   74,   74,   74,   74,   74,   77,   77,
+        77,   77,   77,   77,   77,   77,   77,   77,   77,   77,
++       77,   77,   77,   77,   77,   77,   77,   87,   87,   87,
+        87,   87,   87,   87,   87,   87,   87,   87,   87,   87,
+-       87,   87,   87,   87,   87,   87,   87,   87,   42,   42,
++       87,   87,   87,   87,   87,   87,   42,   42,   42,   42,
+ 
+        42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
+-       42,   42,   42,   42,   42,   42,   99,   99,   99,   99,
++       42,   42,   42,   42,   42,   99,   99,   99,   99,   99,
+        99,   99,   99,   99,   99,   99,   99,   99,   99,   99,
+        99,   99,   99,   99,  105,  105,  105,  105,  105,  105,
+       105,  105,  105,  105,  105,  105,  105,  105,  105,  105,
+-      105,  105,  110,  110,  110,  110,  110,  110,  110,  110,
++      105,  105,  105,  110,  110,  110,  110,  110,  110,  110,
+       110,  110,  110,  110,  110,  110,  110,  110,  110,  110,
++      110,  110,  114,  114,  114,  114,  114,  114,  114,  114,
+       114,  114,  114,  114,  114,  114,  114,  114,  114,  114,
+-      114,  114,  114,  114,  114,  114,  114,  114,  132,  132,
+-      132,  132,  132,  132,  132,  132,  132,  132,  132,  132,
++      114,  132,  132,  132,  132,  132,  132,  132,  132,  132,
+ 
+-      132,  132,  132,  132,  132,  132,  135,  135,  135,  135,
++      132,  132,  132,  132,  132,  132,  132,  132,  132,  132,
+       135,  135,  135,  135,  135,  135,  135,  135,  135,  135,
+-      135,  135,  135,  135,  139,  139,  139,  139,  139,  139,
+-      139,  139,  139,  139,  139,  139,  139,  139,  139,  139,
+-      139,  139,  183,  183,  183,  183,  183,  183,  183,  183,
+-      183,  183,  183,  183,  183,  183,  183,  183,  183,  183,
+-      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
+-      187,  187,  187,  187,  187,  187,  187,  187,  195,  195,
+-      195,  195,  945,  944,  195,  195,  195,  201,  201,  201,
+-      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+-
+-      201,  201,  201,  201,  212,  212,  212,  212,  943,  942,
+-      212,  212,  212,  221,  941,  221,  221,  221,  221,  221,
+-      221,  221,  221,  221,  221,  221,  221,  221,  221,  221,
+-      221,  224,  940,  224,  224,  224,  224,  224,  224,  224,
+-      224,  224,  224,  224,  224,  224,  224,  224,  224,  228,
+-      228,  228,  939,  938,  228,  228,  228,  239,  937,  239,
+-      239,  239,  239,  239,  239,  239,  239,  239,  239,  239,
+-      239,  239,  239,  239,  239,  241,  936,  241,  241,  241,
++      135,  135,  135,  135,  135,  135,  135,  135,  135,  141,
++      141,  141,  141,  141,  141,  141,  141,  141,  141,  141,
++      141,  141,  141,  141,  141,  141,  141,  141,  185,  185,
++      185,  185,  185,  185,  185,  185,  185,  185,  185,  185,
++      185,  185,  185,  185,  185,  185,  185,  189,  189,  189,
++      189,  189,  189,  189,  189,  189,  189,  189,  189,  189,
++      189,  189,  189,  189,  189,  189,  197,  197,  197,  197,
++      960,  959,  958,  197,  197,  197,  203,  203,  203,  203,
++
++      203,  203,  203,  203,  203,  203,  203,  203,  203,  203,
++      203,  203,  203,  203,  214,  214,  214,  214,  957,  956,
++      955,  214,  214,  214,  223,  954,  223,  223,  223,  223,
++      223,  223,  223,  223,  223,  223,  223,  223,  223,  223,
++      223,  223,  223,  226,  953,  226,  226,  226,  226,  226,
++      226,  226,  226,  226,  226,  226,  226,  226,  226,  226,
++      226,  226,  230,  230,  230,  952,  951,  950,  230,  230,
++      230,  241,  949,  241,  241,  241,  241,  241,  241,  241,
+       241,  241,  241,  241,  241,  241,  241,  241,  241,  241,
+-      241,  241,  241,  242,  935,  242,  242,  242,  242,  242,
++      243,  948,  243,  243,  243,  243,  243,  243,  243,  243,
+ 
+-      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+-      242,  246,  246,  246,  246,  246,  246,  246,  246,  246,
+-      246,  246,  246,  246,  246,  246,  246,  246,  246,  248,
+-      934,  248,  248,  248,  933,  248,  248,  248,  932,  931,
+-      248,  248,  930,  929,  928,  248,  248,  250,  250,  250,
+-      250,  927,  926,  250,  250,  250,  254,  925,  924,  254,
+-      254,  254,  254,  254,  254,  254,  254,  254,  254,  254,
+-      254,  254,  254,  254,  262,  262,  262,  262,  923,  922,
+-      262,  262,  262,  267,  921,  267,  267,  267,  267,  267,
+-      267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
+-
+-      267,  270,  920,  270,  270,  270,  270,  270,  270,  270,
+-      270,  270,  270,  919,  270,  270,  270,  270,  270,  271,
+-      918,  271,  917,  916,  271,  271,  271,  271,  915,  914,
+-      271,  271,  273,  913,  273,  273,  273,  273,  273,  273,
+-      273,  273,  273,  273,  273,  273,  273,  273,  273,  273,
+-      277,  277,  277,  277,  912,  911,  277,  277,  277,  280,
+-      280,  280,  280,  280,  280,  280,  280,  280,  280,  280,
+-      280,  280,  280,  280,  280,  280,  280,  283,  283,  283,
+-      283,  283,  910,  283,  283,  283,  283,  283,  283,  283,
+-      283,  283,  283,  283,  283,  287,  909,  287,  908,  287,
+-
+-      287,  287,  287,  287,  287,  287,  907,  287,  287,  287,
+-      287,  287,  287,  289,  906,  289,  289,  289,  289,  289,
+-      289,  289,  289,  289,  289,  289,  289,  289,  289,  289,
+-      289,  290,  905,  290,  290,  290,  904,  290,  290,  290,
+-      903,  902,  290,  290,  901,  900,  899,  290,  290,  295,
+-      295,  295,  295,  898,  897,  295,  295,  295,  300,  896,
+-      300,  300,  300,  300,  300,  300,  300,  300,  300,  300,
+-      300,  300,  300,  300,  300,  300,  304,  304,  895,  304,
+-      304,  894,  893,  892,  304,  304,  335,  891,  335,  335,
+-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+-
+-      335,  335,  335,  335,  338,  890,  889,  338,  338,  338,
+-      338,  338,  338,  338,  338,  338,  338,  338,  338,  338,
+-      341,  888,  341,  341,  341,  341,  341,  341,  341,  341,
+-      341,  341,  341,  341,  341,  341,  341,  341,  342,  887,
+-      342,  342,  342,  342,  342,  342,  342,  342,  342,  342,
+-      342,  342,  342,  342,  342,  342,  350,  350,  886,  885,
+-      350,  350,  350,  352,  352,  884,  883,  352,  352,  352,
+-      353,  353,  353,  353,  353,  353,  353,  353,  353,  353,
+-      353,  353,  353,  353,  353,  353,  353,  353,  212,  212,
+-      212,  212,  882,  879,  212,  212,  212,  357,  357,  357,
++      243,  243,  243,  243,  243,  243,  243,  243,  243,  244,
++      947,  244,  244,  244,  244,  244,  244,  244,  244,  244,
++      244,  244,  244,  244,  244,  244,  244,  244,  248,  248,
++      248,  248,  248,  248,  248,  248,  248,  248,  248,  248,
++      248,  248,  248,  248,  248,  248,  248,  250,  946,  250,
++      250,  250,  945,  250,  250,  250,  944,  943,  250,  250,
++      250,  942,  941,  940,  250,  250,  252,  252,  252,  252,
++      939,  938,  937,  252,  252,  252,  256,  936,  935,  256,
++      256,  256,  256,  256,  256,  256,  256,  256,  256,  256,
++      256,  256,  256,  256,  256,  264,  264,  264,  264,  934,
++
++      933,  932,  264,  264,  264,  269,  931,  269,  269,  269,
++      269,  269,  269,  269,  269,  269,  269,  269,  269,  269,
++      269,  269,  269,  269,  272,  930,  272,  272,  272,  272,
++      272,  272,  272,  272,  272,  272,  272,  929,  272,  272,
++      272,  272,  272,  273,  928,  273,  927,  926,  273,  273,
++      273,  273,  925,  924,  273,  273,  273,  275,  923,  275,
++      275,  275,  275,  275,  275,  275,  275,  275,  275,  275,
++      275,  275,  275,  275,  275,  275,  279,  279,  279,  279,
++      922,  921,  920,  279,  279,  279,  282,  282,  282,  282,
++      282,  282,  282,  282,  282,  282,  282,  282,  282,  282,
++
++      282,  282,  282,  282,  282,  285,  285,  285,  285,  285,
++      919,  285,  285,  285,  285,  285,  918,  285,  917,  285,
++      285,  285,  285,  285,  291,  916,  291,  915,  291,  291,
++      291,  291,  291,  291,  291,  291,  914,  291,  291,  291,
++      291,  291,  291,  293,  913,  293,  293,  293,  293,  293,
++      293,  293,  293,  293,  293,  293,  293,  293,  293,  293,
++      293,  293,  294,  912,  294,  294,  294,  911,  294,  294,
++      294,  910,  909,  294,  294,  294,  908,  907,  906,  294,
++      294,  299,  299,  299,  299,  905,  904,  903,  299,  299,
++      299,  304,  902,  304,  304,  304,  304,  304,  304,  304,
++
++      304,  304,  304,  304,  304,  304,  304,  304,  304,  304,
++      308,  308,  901,  308,  308,  900,  899,  898,  897,  308,
++      308,  339,  896,  339,  339,  339,  339,  339,  339,  339,
++      339,  339,  339,  339,  339,  339,  339,  339,  339,  339,
++      342,  895,  894,  342,  342,  342,  342,  342,  342,  342,
++      342,  342,  342,  342,  342,  342,  342,  345,  893,  345,
++      345,  345,  345,  345,  345,  345,  345,  345,  345,  345,
++      345,  345,  345,  345,  345,  345,  346,  892,  346,  346,
++      346,  346,  346,  346,  346,  346,  346,  346,  346,  346,
++      346,  346,  346,  346,  346,  354,  354,  891,  890,  889,
+ 
++      354,  354,  354,  356,  356,  888,  887,  886,  356,  356,
++      356,  357,  357,  357,  357,  357,  357,  357,  357,  357,
+       357,  357,  357,  357,  357,  357,  357,  357,  357,  357,
+-      357,  357,  357,  357,  357,  361,  878,  361,  361,  361,
+-      361,  361,  361,  361,  361,  361,  361,  877,  361,  361,
+-      361,  361,  361,  221,  876,  221,  221,  221,  221,  221,
+-      221,  221,  221,  221,  221,  221,  221,  221,  221,  221,
+-      221,  368,  368,  875,  874,  873,  872,  368,  369,  369,
+-      369,  369,  871,  870,  369,  369,  369,  869,  369,  374,
+-      868,  374,  374,  374,  374,  374,  374,  374,  374,  374,
+-      374,  374,  374,  374,  374,  374,  374,  239,  867,  239,
+-      239,  239,  239,  239,  239,  239,  239,  239,  239,  239,
+-
+-      239,  239,  239,  239,  239,  241,  866,  241,  241,  241,
++      214,  214,  214,  214,  883,  882,  881,  214,  214,  214,
++      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
++      361,  361,  361,  361,  361,  361,  361,  361,  361,  365,
++      880,  365,  365,  365,  365,  365,  365,  365,  365,  365,
++      365,  365,  879,  365,  365,  365,  365,  365,  223,  878,
++      223,  223,  223,  223,  223,  223,  223,  223,  223,  223,
++      223,  223,  223,  223,  223,  223,  223,  372,  372,  877,
++
++      876,  875,  874,  873,  372,  373,  373,  373,  373,  872,
++      871,  870,  373,  373,  373,  869,  373,  378,  868,  378,
++      378,  378,  378,  378,  378,  378,  378,  378,  378,  378,
++      378,  378,  378,  378,  378,  378,  241,  867,  241,  241,
+       241,  241,  241,  241,  241,  241,  241,  241,  241,  241,
+-      241,  241,  241,  242,  865,  242,  242,  242,  242,  242,
+-      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+-      242,  376,  864,  376,  376,  376,  376,  376,  376,  376,
+-      376,  376,  376,  376,  376,  376,  376,  376,  376,  377,
+-      863,  377,  377,  377,  377,  377,  377,  377,  377,  377,
+-      377,  377,  377,  377,  377,  377,  377,  246,  246,  246,
+-      246,  246,  246,  246,  246,  246,  246,  246,  246,  246,
+-      246,  246,  246,  246,  246,  248,  862,  248,  248,  248,
+-
+-      861,  248,  248,  248,  860,  859,  248,  248,  858,  857,
+-      856,  248,  248,  250,  250,  250,  250,  855,  854,  250,
+-      250,  250,  254,  853,  852,  254,  254,  254,  254,  254,
+-      254,  254,  254,  254,  254,  254,  254,  254,  254,  254,
+-      262,  262,  262,  262,  851,  850,  262,  262,  262,  384,
+-      384,  849,  848,  847,  384,  384,  271,  846,  271,  843,
+-      842,  271,  271,  271,  271,  841,  840,  271,  271,  273,
+-      839,  273,  273,  273,  273,  273,  273,  273,  273,  273,
+-      273,  273,  273,  273,  273,  273,  273,  277,  277,  277,
+-      277,  838,  837,  277,  277,  277,  280,  280,  280,  280,
+-
+-      280,  280,  280,  280,  280,  280,  280,  280,  280,  280,
+-      280,  280,  280,  280,  283,  283,  283,  283,  283,  836,
+-      283,  283,  283,  283,  283,  283,  283,  283,  283,  283,
+-      283,  283,  287,  835,  287,  834,  287,  287,  287,  287,
+-      287,  287,  287,  833,  287,  287,  287,  287,  287,  287,
+-      290,  832,  290,  290,  290,  831,  290,  290,  290,  830,
+-      829,  290,  290,  828,  827,  826,  290,  290,  295,  295,
+-      295,  295,  825,  824,  295,  295,  295,  300,  823,  300,
+-      300,  300,  300,  300,  300,  300,  300,  300,  300,  300,
+-      300,  300,  300,  300,  300,  304,  304,  822,  304,  304,
+-
+-      821,  820,  819,  304,  304,  335,  818,  335,  335,  335,
+-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+-      335,  335,  335,  338,  817,  816,  338,  338,  338,  338,
+-      338,  338,  338,  338,  338,  338,  338,  338,  338,  341,
+-      815,  341,  341,  341,  341,  341,  341,  341,  341,  341,
+-      341,  341,  341,  341,  341,  341,  341,  342,  814,  342,
++      241,  241,  241,  241,  241,  243,  866,  243,  243,  243,
++      243,  243,  243,  243,  243,  243,  243,  243,  243,  243,
++      243,  243,  243,  243,  244,  865,  244,  244,  244,  244,
++      244,  244,  244,  244,  244,  244,  244,  244,  244,  244,
++      244,  244,  244,  380,  864,  380,  380,  380,  380,  380,
++
++      380,  380,  380,  380,  380,  380,  380,  380,  380,  380,
++      380,  380,  381,  863,  381,  381,  381,  381,  381,  381,
++      381,  381,  381,  381,  381,  381,  381,  381,  381,  381,
++      381,  248,  248,  248,  248,  248,  248,  248,  248,  248,
++      248,  248,  248,  248,  248,  248,  248,  248,  248,  248,
++      250,  862,  250,  250,  250,  861,  250,  250,  250,  860,
++      859,  250,  250,  250,  858,  857,  856,  250,  250,  252,
++      252,  252,  252,  855,  854,  853,  252,  252,  252,  256,
++      852,  851,  256,  256,  256,  256,  256,  256,  256,  256,
++      256,  256,  256,  256,  256,  256,  256,  256,  264,  264,
++
++      264,  264,  850,  847,  846,  264,  264,  264,  388,  388,
++      845,  844,  843,  842,  388,  388,  273,  841,  273,  840,
++      839,  273,  273,  273,  273,  838,  837,  273,  273,  273,
++      275,  836,  275,  275,  275,  275,  275,  275,  275,  275,
++      275,  275,  275,  275,  275,  275,  275,  275,  275,  279,
++      279,  279,  279,  835,  834,  833,  279,  279,  279,  282,
++      282,  282,  282,  282,  282,  282,  282,  282,  282,  282,
++      282,  282,  282,  282,  282,  282,  282,  282,  285,  285,
++      285,  285,  285,  832,  285,  285,  285,  285,  285,  831,
++      285,  830,  285,  285,  285,  285,  285,  291,  829,  291,
++
++      828,  291,  291,  291,  291,  291,  291,  291,  291,  827,
++      291,  291,  291,  291,  291,  291,  294,  826,  294,  294,
++      294,  825,  294,  294,  294,  824,  823,  294,  294,  294,
++      822,  821,  820,  294,  294,  299,  299,  299,  299,  819,
++      818,  814,  299,  299,  299,  304,  810,  304,  304,  304,
++      304,  304,  304,  304,  304,  304,  304,  304,  304,  304,
++      304,  304,  304,  304,  308,  308,  809,  308,  308,  808,
++      807,  806,  805,  308,  308,  339,  804,  339,  339,  339,
++      339,  339,  339,  339,  339,  339,  339,  339,  339,  339,
++      339,  339,  339,  339,  342,  799,  798,  342,  342,  342,
++
+       342,  342,  342,  342,  342,  342,  342,  342,  342,  342,
+-      342,  342,  342,  342,  342,  450,  450,  450,  450,  450,
+-      450,  450,  450,  450,  450,  450,  450,  450,  450,  450,
+-      450,  450,  450,  459,  459,  459,  459,  810,  806,  459,
+-
+-      459,  459,  461,  461,  461,  461,  805,  804,  461,  461,
+-      461,  353,  353,  353,  353,  353,  353,  353,  353,  353,
+-      353,  353,  353,  353,  353,  353,  353,  353,  353,  357,
++      342,  345,  797,  345,  345,  345,  345,  345,  345,  345,
++      345,  345,  345,  345,  345,  345,  345,  345,  345,  345,
++      346,  796,  346,  346,  346,  346,  346,  346,  346,  346,
++      346,  346,  346,  346,  346,  346,  346,  346,  346,  454,
++      454,  454,  454,  454,  454,  454,  454,  454,  454,  454,
++      454,  454,  454,  454,  454,  454,  454,  454,  463,  463,
++      463,  463,  795,  794,  793,  463,  463,  463,  465,  465,
++      465,  465,  790,  789,  788,  465,  465,  465,  357,  357,
+       357,  357,  357,  357,  357,  357,  357,  357,  357,  357,
+-      357,  357,  357,  357,  357,  357,  357,  361,  803,  361,
+-      361,  361,  361,  361,  361,  361,  361,  361,  361,  802,
+-      361,  361,  361,  361,  361,  469,  469,  801,  800,  795,
+-      794,  469,  369,  369,  369,  369,  793,  792,  369,  369,
+-      369,  791,  369,  374,  790,  374,  374,  374,  374,  374,
+-      374,  374,  374,  374,  374,  374,  374,  374,  374,  374,
+-
+-      374,  376,  789,  376,  376,  376,  376,  376,  376,  376,
+-      376,  376,  376,  376,  376,  376,  376,  376,  376,  377,
+-      786,  377,  377,  377,  377,  377,  377,  377,  377,  377,
+-      377,  377,  377,  377,  377,  377,  377,  250,  250,  250,
+-      250,  785,  784,  250,  250,  250,  548,  783,  548,  548,
+-      548,  548,  548,  548,  548,  548,  548,  548,  548,  548,
+-      548,  548,  548,  548,  695,  695,  695,  695,  695,  695,
+-      695,  695,  695,  695,  695,  695,  695,  695,  695,  695,
+-      695,  695,  811,  811,  811,  811,  811,  811,  811,  811,
+-      811,  811,  811,  811,  811,  811,  811,  811,  811,  811,
+-
+-      782,  781,  780,  779,  778,  777,  776,  775,  774,  773,
+-      772,  771,  769,  768,  767,  766,  765,  764,  763,  762,
+-      761,  760,  759,  758,  757,  751,  750,  743,  742,  741,
+-      740,  739,  738,  737,  736,  735,  734,  733,  732,  731,
+-      730,  729,  728,  727,  726,  725,  724,  723,  722,  721,
+-      720,  717,  716,  715,  702,  701,  700,  629,  699,  698,
+-      624,  694,  693,  692,  691,  690,  689,  688,  687,  686,
+-      685,  684,  683,  682,  681,  680,  679,  678,  677,  676,
+-      675,  674,  673,  672,  671,  670,  669,  668,  667,  666,
+-      665,  664,  663,  662,  659,  658,  655,  654,  653,  652,
+-
+-      651,  638,  637,  636,  635,  632,  631,  627,  626,  625,
+-      624,  623,  622,  621,  620,  619,  618,  617,  616,  615,
+-      614,  613,  610,  609,  608,  607,  606,  605,  604,  603,
+-      602,  601,  600,  599,  598,  597,  596,  595,  594,  593,
+-      592,  591,  590,  589,  585,  584,  583,  582,  581,  580,
+-      579,  578,  577,  576,  575,  562,  561,  560,  559,  558,
+-      555,  551,  547,  546,  545,  541,  540,  539,  538,  537,
+-      536,  535,  534,  533,  532,  528,  527,  526,  525,  524,
+-      521,  520,  519,  518,  517,  516,  515,  514,  513,  512,
+-      511,  510,  509,  508,  507,  506,  505,  504,  503,  502,
+-
+-      501,  500,  499,  498,  497,  496,  495,  494,  493,  492,
+-      491,  490,  489,  488,  476,  474,  473,  472,  471,  370,
+-      462,  460,  458,  457,  456,  344,  449,  336,  438,  437,
+-      434,  428,  425,  424,  423,  422,  421,  420,  417,  416,
+-      415,  414,  411,  410,  409,  406,  405,  402,  401,  301,
+-      298,  400,  399,  294,  396,  395,  260,  258,  260,  255,
+-      379,  378,  247,  243,  375,  373,  372,  371,  230,  370,
+-      360,  218,  356,  214,  351,  340,  197,  193,  339,  336,
+-      334,  333,  332,  331,  330,  329,  328,  324,  318,  317,
+-      316,  313,  312,  303,  302,  301,  299,  298,  297,  296,
+-
+-      276,  294,  293,  288,  286,  279,  278,  276,  272,  266,
+-      269,  266,  265,  263,  261,  258,  260,  256,  255,  253,
+-      252,  251,  249,  247,  243,  240,  238,  230,  220,  214,
+-      211,  197,  193,  972,   98,   98,   86,   78,   78,   41,
+-      972,  972,  972,  972,  972,  972,  972,  972,  972,  972,
+-      972,  972,  972,  972,  972,  972,  972,  972,  972,  972,
+-      972,  972,  972,  972,  972,  972,  972,  972,  972,  972,
+-      972,  972,  972,  972,  972,  972,  972,  972,  972,  972,
+-      972,  972,  972,  972,  972,  972,  972,  972,  972,  972,
+-      972,  972,  972,  972,  972,  972,  972,  972,  972
+ 
++      357,  357,  357,  357,  357,  357,  357,  361,  361,  361,
++      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
++      361,  361,  361,  361,  361,  361,  365,  787,  365,  365,
++      365,  365,  365,  365,  365,  365,  365,  365,  365,  786,
++      365,  365,  365,  365,  365,  473,  473,  785,  784,  783,
++      782,  781,  473,  373,  373,  373,  373,  780,  779,  778,
++      373,  373,  373,  777,  373,  378,  776,  378,  378,  378,
++      378,  378,  378,  378,  378,  378,  378,  378,  378,  378,
++      378,  378,  378,  378,  380,  775,  380,  380,  380,  380,
++      380,  380,  380,  380,  380,  380,  380,  380,  380,  380,
++
++      380,  380,  380,  381,  773,  381,  381,  381,  381,  381,
++      381,  381,  381,  381,  381,  381,  381,  381,  381,  381,
++      381,  381,  252,  252,  252,  252,  772,  771,  770,  252,
++      252,  252,  552,  769,  552,  552,  552,  552,  552,  552,
++      552,  552,  552,  552,  552,  552,  552,  552,  552,  552,
++      552,  699,  699,  699,  699,  699,  699,  699,  699,  699,
++      699,  699,  699,  699,  699,  699,  699,  699,  699,  699,
++      815,  815,  815,  815,  815,  815,  815,  815,  815,  815,
++      815,  815,  815,  815,  815,  815,  815,  815,  815,  768,
++      767,  766,  765,  764,  763,  762,  761,  755,  754,  747,
++
++      746,  745,  744,  743,  742,  741,  740,  739,  738,  737,
++      736,  735,  734,  733,  732,  731,  730,  729,  728,  727,
++      726,  725,  724,  721,  720,  719,  706,  705,  704,  633,
++      703,  702,  628,  698,  697,  696,  695,  694,  693,  692,
++      691,  690,  689,  688,  687,  686,  685,  684,  683,  682,
++      681,  680,  679,  678,  677,  676,  675,  674,  673,  672,
++      671,  670,  669,  668,  667,  666,  663,  662,  659,  658,
++      657,  656,  655,  642,  641,  640,  639,  636,  635,  631,
++      630,  629,  628,  627,  626,  625,  624,  623,  622,  621,
++      620,  619,  618,  617,  614,  613,  612,  611,  610,  609,
++
++      608,  607,  606,  605,  604,  603,  602,  601,  600,  599,
++      598,  597,  596,  595,  594,  593,  589,  588,  587,  586,
++      585,  584,  583,  582,  581,  580,  579,  566,  565,  564,
++      563,  562,  559,  555,  551,  550,  549,  545,  544,  543,
++      542,  541,  540,  539,  538,  537,  536,  532,  531,  530,
++      529,  528,  525,  524,  523,  522,  521,  520,  519,  518,
++      517,  516,  515,  514,  513,  512,  511,  510,  509,  508,
++      507,  506,  505,  504,  503,  502,  501,  500,  499,  498,
++      497,  496,  495,  494,  493,  492,  480,  478,  477,  476,
++      475,  374,  466,  464,  462,  461,  460,  348,  453,  340,
++
++      442,  441,  438,  432,  429,  428,  427,  426,  425,  424,
++      421,  420,  419,  418,  415,  414,  413,  410,  409,  406,
++      405,  305,  302,  404,  403,  298,  400,  399,  262,  260,
++      262,  257,  383,  382,  249,  245,  379,  377,  376,  375,
++      232,  374,  364,  220,  360,  216,  355,  344,  199,  195,
++      343,  340,  338,  337,  336,  335,  334,  333,  332,  328,
++      322,  321,  320,  317,  316,  307,  306,  305,  303,  302,
++      301,  300,  278,  298,  297,  292,  290,  289,  288,  281,
++      280,  278,  274,  268,  271,  268,  267,  265,  263,  260,
++      262,  258,  257,  255,  254,  253,  251,  249,  245,  242,
++
++      240,  232,  222,  216,  213,  199,  195,  976,   98,   98,
++       86,   78,   78,   41,  976,  976,  976,  976,  976,  976,
++      976,  976,  976,  976,  976,  976,  976,  976,  976,  976,
++      976,  976,  976,  976,  976,  976,  976,  976,  976,  976,
++      976,  976,  976,  976,  976,  976,  976,  976,  976,  976,
++      976,  976,  976,  976,  976,  976,  976,  976,  976,  976,
++      976,  976,  976,  976,  976,  976,  976,  976,  976,  976,
++      976,  976,  976
+     } ;
+ 
+-static yyconst flex_int16_t yy_chk[3300] =
++static yyconst flex_int16_t yy_chk[3374] =
+     {   0,
+         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+@@ -1137,19 +1147,19 @@
+ 
+         2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
+         2,    2,    2,    2,    2,    2,    2,    2,    3,    3,
+-      569,    3,    3,    5,    3,    5,   21,    3,    3,    3,
+-        6,    6,    3,    6,   27,  569,   27,    6,    3,   11,
+-       11,  392,   11,    3,    3,   12,   12,   17,   12,   17,
++      949,    3,    3,    5,    3,    5,   21,    3,    3,    3,
++        6,    6,    3,    6,   27,  437,   27,    6,    3,   11,
++       11,  437,   11,    3,    3,   12,   12,   17,   12,   17,
+        21,   21,   50,   21,   18,   28,   18,   28,   17,   62,
+-       62,   17,   17,   17,   17,   18,  125,  392,   18,   18,
+-       18,   18,  949,    3,    3,    3,    4,    4,  173,    4,
+-        4,   22,    4,    4,  125,    4,    4,    4,  173,   19,
+-        4,   19,   19,   50,  273,   20,    4,   20,   20,  221,
+-
+-      221,    4,    4,   17,    4,   22,   22,   29,   22,   29,
+-       18,  113,  273,   30,   19,   30,   29,  581,   43,   43,
+-       20,   43,   30,   47,   47,  113,   47,   59,   59,  581,
+-       59,    4,    4,    4,    9,    9,    9,    9,    9,    9,
++       62,   17,   17,   17,   17,   18,  125,   68,   18,   18,
++       18,   18,  950,    3,    3,    3,    4,    4,  175,    4,
++        4,   22,    4,    4,  125,    4,    4,    4,  175,   19,
++        4,   19,   19,   50,  312,   20,    4,   20,   20,  275,
++
++      147,    4,    4,   17,    4,   22,   22,  147,   22,   37,
++       18,  312,   37,   38,   19,   68,   38,  275,   43,   43,
++       20,   43,  953,   37,   37,   37,   37,   38,   38,   38,
++       38,    4,    4,    4,    9,    9,    9,    9,    9,    9,
+         9,    9,    9,    9,    9,    9,    9,    9,    9,    9,
+         9,    9,    9,    9,    9,    9,    9,    9,    9,    9,
+         9,    9,    9,    9,    9,    9,    9,    9,    9,    9,
+@@ -1162,9 +1172,9 @@
+        13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
+        13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
+        13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
+-       13,   13,   23,  736,   23,   24,   37,   24,  145,   37,
+-       64,   64,   64,   64,   23,  145,   76,   24,   76,  736,
+-       37,   37,   37,   37,  225,  225,   23,   23,   23,   24,
++       13,   13,   23,  575,   23,   24,  174,   24,   47,   47,
++      174,   47,   59,   59,   23,   59,  575,   24,   64,   64,
++       64,   64,   76,  132,   76,  132,   23,   23,   23,   24,
+        24,   24,   25,   25,   25,   25,   25,   25,   25,   25,
+        25,   25,   25,   25,   25,   25,   25,   25,   25,   25,
+ 
+@@ -1172,321 +1182,329 @@
+        25,   25,   25,   25,   25,   25,   25,   25,   25,   25,
+        25,   25,   25,   25,   25,   25,   25,   25,   25,   25,
+        25,   25,   25,   25,   25,   25,   25,   25,   25,   25,
+-       25,   31,  951,   31,   31,   32,   38,   32,   32,   38,
+-       92,   92,  222,   92,  103,  103,  103,  103,  222,  222,
+-       38,   38,   38,   38,  172,  132,   31,  132,  172,  952,
+-       32,   33,   33,   33,   33,   33,   33,   33,   33,   33,
++       25,   29,   30,   29,   30,   31,  295,   31,   31,  573,
++       29,   30,   32,  295,   32,   32,   92,   92,  113,   92,
++      103,  103,  103,  103,  573,   29,   30,   29,   30,  134,
++       31,  134,  113,  135,  137,  135,  137,   32,   33,   33,
+        33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
+        33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
+ 
+        33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
+        33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
+        33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
++       33,   33,   33,   33,   33,   33,   33,   35,   35,   35,
+        35,   35,   35,   35,   35,   35,   35,   35,   35,   35,
+        35,   35,   35,   35,   35,   35,   35,   35,   35,   35,
+        35,   35,   35,   35,   35,   35,   35,   35,   35,   35,
+        35,   35,   35,   35,   35,   35,   35,   35,   35,   35,
+        35,   35,   35,   35,   35,   35,   35,   35,   35,   35,
+-       35,   35,   35,   35,   35,   35,   35,   35,   35,   39,
+-       40,   39,   40,   55,   55,  953,   55,   63,   63,  167,
++       35,   35,   35,   35,   35,   35,   39,   40,   39,   40,
+ 
+-       55,   65,   65,   68,   65,  134,  163,  134,   65,  164,
+-      109,  109,  112,  112,  163,   65,  119,  119,  135,  167,
+-      135,   65,  137,  175,  137,  162,  199,  162,  164,   65,
+-      210,  162,  210,  175,  954,   63,  175,  186,  186,  186,
+-      186,  223,  223,   39,   40,   39,   40,   51,  109,   55,
+-      112,   68,  192,  192,  119,  192,  308,   65,  196,  196,
+-      217,  196,  217,  257,  257,  390,  257,  199,  213,  213,
+-       51,  213,   51,  308,   51,  213,  280,  312,  280,  223,
+-       51,  312,  317,   51,   51,   51,  317,   51,   51,   51,
+-      390,  203,  203,   51,  203,   51,  204,  204,  291,  204,
+-
+-      205,  205,  282,  205,  282,  291,  203,  203,  203,  203,
+-      955,  204,  204,  204,  204,  205,  205,  205,  205,  206,
+-      206,  283,  206,  283,  213,  305,  229,  229,  285,  229,
+-      285,  361,  361,  229,  206,  206,  206,  206,  203,  305,
+-      229,  264,  264,  264,  264,  205,  229,  326,  329,  328,
+-      478,  329,  331,  328,  229,  367,  367,  326,  328,  331,
+-      353,  478,  353,  206,  337,  337,  337,  337,  355,  357,
+-      355,  357,  359,  362,  359,  370,  370,  370,  370,  362,
+-      362,  956,  229,  253,  253,  253,  253,  253,  253,  253,
+-      253,  253,  253,  253,  253,  253,  253,  253,  253,  253,
+-
+-      253,  253,  253,  253,  253,  253,  253,  253,  253,  253,
+-      253,  253,  253,  253,  253,  253,  253,  253,  253,  253,
+-      253,  253,  253,  253,  253,  253,  253,  253,  253,  253,
+-      253,  253,  253,  253,  253,  253,  253,  253,  253,  253,
+-      253,  253,  266,  266,  266,  266,  385,  394,  266,  433,
+-      450,  957,  450,  266,  453,  433,  453,  266,  529,  844,
+-      266,  394,  266,  844,  529,  266,  294,  294,  385,  294,
+-      294,  294,  294,  294,  294,  294,  294,  294,  294,  294,
+-      294,  294,  294,  294,  294,  294,  294,  294,  294,  294,
+-      294,  294,  294,  294,  294,  294,  294,  294,  294,  294,
+-
+-      294,  294,  294,  294,  294,  294,  294,  294,  294,  294,
+-      294,  294,  294,  294,  294,  294,  294,  294,  294,  294,
+-      294,  294,  294,  294,  294,  334,  334,  387,  334,  363,
+-      363,  334,  334,  388,  393,  479,  386,  334,  334,  343,
+-      343,  363,  343,  334,  334,  641,  346,  346,  334,  346,
+-      960,  387,  388,  480,  343,  343,  343,  343,  386,  961,
+-      393,  346,  346,  346,  346,  479,  641,  363,  364,  364,
+-      480,  364,  364,  364,  364,  364,  364,  364,  364,  364,
+-      364,  364,  364,  364,  364,  364,  364,  364,  364,  364,
+-      364,  364,  364,  364,  364,  364,  460,  364,  364,  364,
+-
+-      364,  364,  364,  364,  364,  364,  364,  364,  364,  364,
+-      364,  364,  364,  364,  364,  364,  364,  364,  364,  364,
+-      364,  364,  364,  364,  364,  364,  364,  365,  365,  439,
+-      556,  556,  439,  439,  481,  557,  557,  365,  365,  366,
+-      366,  366,  366,  455,  455,  481,  455,  366,  964,  366,
+-      366,  460,  633,  633,  366,  366,  366,  366,  366,  366,
+-      380,  380,  380,  380,  380,  380,  380,  380,  380,  380,
+-      380,  380,  380,  380,  380,  380,  380,  380,  380,  380,
+-      380,  380,  380,  380,  380,  380,  380,  380,  380,  380,
+-      380,  380,  380,  380,  380,  380,  380,  380,  380,  380,
++       55,   55,  166,   55,   63,   63,  165,   55,   65,   65,
++      164,   65,  164,  169,  165,   65,  164,  109,  109,  112,
++      112,  166,   65,  119,  119,  177,  201,  335,   65,  188,
++      188,  188,  188,  169,  335,  177,   65,  212,  177,  212,
++      194,  194,   63,  194,  198,  198,  219,  198,  219,  955,
++       39,   40,   39,   40,   51,  109,   55,  112,  223,  223,
++      309,  119,  227,  227,   65,  643,  224,  201,  205,  205,
++      330,  205,  224,  224,  309,  215,  215,   51,  215,   51,
++      330,   51,  215,  205,  205,  205,  205,   51,  643,  316,
++       51,   51,   51,  316,   51,   51,   51,  225,  225,  282,
++
++       51,  282,   51,  206,  206,  321,  206,  207,  207,  321,
++      207,  208,  208,  333,  208,  205,  333,  956,  206,  206,
++      206,  206,  207,  207,  207,  207,  208,  208,  208,  208,
++      284,  215,  284,  231,  231,  225,  231,  957,  259,  259,
++      231,  259,  266,  266,  266,  266,  285,  231,  285,  287,
++      332,  287,  207,  231,  332,  208,  391,  347,  347,  332,
++      347,  231,  341,  341,  341,  341,  350,  350,  357,  350,
++      357,  958,  347,  347,  347,  347,  359,  361,  359,  361,
++      391,  350,  350,  350,  350,  363,  454,  363,  454,  231,
++      255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
++
++      255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
++      255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
++      255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
++      255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
++      255,  255,  255,  255,  255,  255,  255,  255,  255,  268,
++      268,  268,  268,  365,  365,  268,  366,  371,  371,  482,
++      268,  398,  366,  366,  268,  533,  457,  268,  457,  268,
++      482,  533,  268,  298,  298,  398,  298,  298,  298,  298,
++      298,  298,  298,  298,  298,  298,  298,  298,  298,  298,
++      298,  298,  298,  298,  298,  298,  298,  298,  298,  298,
++
++      298,  298,  298,  298,  298,  298,  298,  298,  298,  298,
++      298,  298,  298,  298,  298,  298,  298,  298,  298,  298,
++      298,  298,  298,  298,  298,  298,  298,  298,  298,  298,
++      298,  298,  338,  338,  396,  338,  367,  367,  338,  338,
++      389,  390,  369,  369,  338,  338,  392,  394,  367,  393,
++      338,  338,  369,  369,  577,  338,  374,  374,  374,  374,
++      396,  959,  389,  390,  443,  392,  960,  443,  443,  577,
++      459,  459,  394,  459,  367,  368,  368,  393,  368,  368,
++      368,  368,  368,  368,  368,  368,  368,  368,  368,  368,
++      368,  368,  368,  368,  368,  368,  368,  368,  368,  368,
++
++      368,  368,  368,  961,  368,  368,  368,  368,  368,  368,
++      368,  368,  368,  368,  368,  368,  368,  368,  368,  368,
++      368,  368,  368,  368,  368,  368,  368,  368,  368,  368,
++      368,  368,  368,  368,  370,  370,  370,  370,  547,  629,
++      547,  629,  370,  964,  370,  370,  559,  559,  559,  370,
++      370,  370,  370,  370,  370,  384,  384,  384,  384,  384,
++      384,  384,  384,  384,  384,  384,  384,  384,  384,  384,
++      384,  384,  384,  384,  384,  384,  384,  384,  384,  384,
++      384,  384,  384,  384,  384,  384,  384,  384,  384,  384,
++      384,  384,  384,  384,  384,  384,  384,  384,  384,  384,
++
++      384,  384,  384,  384,  384,  384,  384,  384,  384,  384,
++      384,  384,  384,  384,  387,  387,  395,  387,  387,  387,
++      387,  387,  387,  387,  387,  397,  387,  387,  387,  387,
++      387,  387,  387,  387,  387,  387,  387,  387,  484,  965,
++      387,  387,  387,  387,  395,  455,  455,  395,  455,  458,
++      458,  397,  458,  464,  483,  484,  487,  553,  468,  468,
++      455,  455,  455,  455,  458,  458,  458,  458,  468,  468,
++      387,  387,  387,  402,  402,  487,  402,  402,  402,  402,
++      402,  402,  402,  402,  483,  402,  402,  402,  402,  402,
++      402,  402,  402,  402,  402,  402,  402,  481,  485,  402,
++
++      402,  402,  402,  471,  471,  486,  489,  491,  464,  485,
++      488,  490,  553,  471,  471,  548,  548,  489,  548,  554,
++      554,  481,  554,  481,  560,  560,  491,  561,  561,  402,
++      402,  402,  467,  467,  488,  637,  637,  490,  486,  467,
++      467,  467,  467,  467,  467,  467,  467,  467,  467,  467,
++      467,  467,  467,  467,  467,  467,  467,  467,  467,  467,
++      467,  467,  467,  467,  469,  469,  469,  469,  505,  572,
++      569,  568,  469,  571,  968,  567,  636,  636,  636,  469,
++      469,  469,  469,  469,  469,  472,  472,  472,  472,  568,
++      505,  570,  571,  472,  569,  572,  505,  557,  557,  574,
++
++      472,  472,  472,  472,  472,  472,  567,  557,  557,  558,
++      558,  558,  558,  578,  638,  638,  646,  558,  576,  570,
++      585,  645,  647,  574,  558,  558,  558,  558,  558,  558,
++      578,  576,  585,  590,  632,  632,  644,  632,  646,  648,
++      649,  650,  645,  590,  651,  652,  654,  644,  653,  663,
++      693,  693,  647,  718,  699,  693,  699,  648,  693,  663,
++      652,  693,  697,  697,  740,  654,  693,  697,  649,  969,
++      697,  650,  795,  697,  651,  701,  653,  701,  751,  970,
++      740,  759,  751,  718,  759,  751,  761,  972,  761,  795,
++      815,  817,  815,  817,  759,  751,  848,  973, 1019, 1019,
+ 
+-      380,  380,  380,  380,  380,  380,  380,  380,  380,  380,
+-      380,  380,  380,  380,  380,  380,  380,  380,  380,  383,
+-      383,  389,  383,  383,  383,  383,  383,  383,  383,  383,
+-      391,  383,  383,  383,  383,  383,  383,  383,  383,  383,
+-      383,  383,  383,  483,  573,  383,  383,  383,  383,  389,
+-      451,  451,  965,  451,  454,  454,  482,  454,  391,  573,
+-      966,  391,  483,  464,  464,  451,  451,  451,  451,  454,
+-      454,  454,  454,  464,  464,  383,  383,  383,  398,  398,
+-      563,  398,  398,  398,  398,  398,  398,  398,  398,  482,
+-      398,  398,  398,  398,  398,  398,  398,  398,  398,  398,
+-
+-      398,  398,  467,  467,  398,  398,  398,  398,  484,  485,
+-      487,  563,  467,  467,  486,  477,  543,  568,  543,  549,
+-      485,  544,  544,  567,  544,  550,  550,  968,  550,  487,
+-      969,  625,  484,  625,  398,  398,  398,  463,  463,  477,
+-      486,  477,  567,  568,  463,  463,  463,  463,  463,  463,
+-      463,  463,  463,  463,  463,  463,  463,  463,  463,  463,
+-      463,  463,  463,  463,  463,  463,  463,  463,  463,  465,
+-      465,  465,  465,  501,  549,  565,  564,  465,  555,  555,
+-      555,  634,  634,  566,  465,  465,  465,  465,  465,  465,
+-      468,  468,  468,  468,  564,  501,  570,  946,  468,  565,
+-
+-      945,  501,  553,  553,  574,  468,  468,  468,  468,  468,
+-      468,  566,  553,  553,  554,  554,  554,  554,  586,  639,
+-      570,  574,  554,  571,  572,  632,  632,  632,  586,  554,
+-      554,  554,  554,  554,  554,  640,  571,  572,  628,  628,
+-      642,  628,  639,  643,  645,  644,  640,  646,  647,  648,
+-      650,  649,  695,  791,  695,  659,  697,  714,  697,  757,
+-      944,  757,  642,  644,  648,  659, 1015, 1015,  755,  650,
+-      791,  755,  645,  643,  943,  689,  689,  646,  647,  649,
+-      689,  755,  942,  689,  693,  693,  689,  714,  941,  693,
+-      747,  689,  693,  940,  747,  693,  811,  747,  811,  813,
+-
+-      936,  813,  935,  934,  933,  931,  929,  747,  973,  973,
+-      973,  973,  973,  973,  973,  973,  973,  973,  973,  973,
+-      973,  973,  973,  973,  973,  973,  974,  974,  974,  974,
+-      974,  974,  974,  974,  974,  974,  974,  974,  974,  974,
+-      974,  974,  974,  974,  975,  975,  975,  975,  975,  975,
+-      975,  975,  975,  975,  975,  975,  975,  975,  975,  975,
+-      975,  975,  976,  976,  976,  976,  976,  976,  976,  976,
+-      976,  976,  976,  976,  976,  976,  976,  976,  976,  976,
++      848,  977,  977,  977,  977,  977,  977,  977,  977,  977,
+       977,  977,  977,  977,  977,  977,  977,  977,  977,  977,
+-      977,  977,  977,  977,  977,  977,  977,  977,  978,  978,
+-
+       978,  978,  978,  978,  978,  978,  978,  978,  978,  978,
+-      978,  978,  978,  978,  978,  978,  979,  979,  979,  979,
++      978,  978,  978,  978,  978,  978,  978,  978,  978,  979,
+       979,  979,  979,  979,  979,  979,  979,  979,  979,  979,
+-      979,  979,  979,  979,  980,  980,  980,  980,  980,  980,
++      979,  979,  979,  979,  979,  979,  979,  979,  980,  980,
+       980,  980,  980,  980,  980,  980,  980,  980,  980,  980,
+-      980,  980,  981,  981,  981,  981,  981,  981,  981,  981,
++      980,  980,  980,  980,  980,  980,  980,  981,  981,  981,
+       981,  981,  981,  981,  981,  981,  981,  981,  981,  981,
++      981,  981,  981,  981,  981,  981,  982,  982,  982,  982,
++
+       982,  982,  982,  982,  982,  982,  982,  982,  982,  982,
+-      982,  982,  982,  982,  982,  982,  982,  982,  983,  983,
++      982,  982,  982,  982,  982,  983,  983,  983,  983,  983,
+       983,  983,  983,  983,  983,  983,  983,  983,  983,  983,
+-
+-      983,  983,  983,  983,  983,  983,  984,  984,  984,  984,
++      983,  983,  983,  983,  984,  984,  984,  984,  984,  984,
+       984,  984,  984,  984,  984,  984,  984,  984,  984,  984,
+-      984,  984,  984,  984,  985,  985,  985,  985,  985,  985,
++      984,  984,  984,  985,  985,  985,  985,  985,  985,  985,
+       985,  985,  985,  985,  985,  985,  985,  985,  985,  985,
+       985,  985,  986,  986,  986,  986,  986,  986,  986,  986,
+       986,  986,  986,  986,  986,  986,  986,  986,  986,  986,
++      986,  987,  987,  987,  987,  987,  987,  987,  987,  987,
++
+       987,  987,  987,  987,  987,  987,  987,  987,  987,  987,
+-      987,  987,  987,  987,  987,  987,  987,  987,  988,  988,
+-      988,  988,  928,  927,  988,  988,  988,  989,  989,  989,
++      988,  988,  988,  988,  988,  988,  988,  988,  988,  988,
++      988,  988,  988,  988,  988,  988,  988,  988,  988,  989,
+       989,  989,  989,  989,  989,  989,  989,  989,  989,  989,
+-
+-      989,  989,  989,  989,  990,  990,  990,  990,  926,  924,
+-      990,  990,  990,  991,  923,  991,  991,  991,  991,  991,
++      989,  989,  989,  989,  989,  989,  989,  989,  990,  990,
++      990,  990,  990,  990,  990,  990,  990,  990,  990,  990,
++      990,  990,  990,  990,  990,  990,  990,  991,  991,  991,
+       991,  991,  991,  991,  991,  991,  991,  991,  991,  991,
+-      991,  992,  922,  992,  992,  992,  992,  992,  992,  992,
+-      992,  992,  992,  992,  992,  992,  992,  992,  992,  993,
+-      993,  993,  921,  918,  993,  993,  993,  994,  915,  994,
+-      994,  994,  994,  994,  994,  994,  994,  994,  994,  994,
+-      994,  994,  994,  994,  994,  995,  914,  995,  995,  995,
+-      995,  995,  995,  995,  995,  995,  995,  995,  995,  995,
+-      995,  995,  995,  996,  913,  996,  996,  996,  996,  996,
++      991,  991,  991,  991,  991,  991,  992,  992,  992,  992,
++      948,  947,  946,  992,  992,  992,  993,  993,  993,  993,
+ 
++      993,  993,  993,  993,  993,  993,  993,  993,  993,  993,
++      993,  993,  993,  993,  994,  994,  994,  994,  945,  944,
++      940,  994,  994,  994,  995,  939,  995,  995,  995,  995,
++      995,  995,  995,  995,  995,  995,  995,  995,  995,  995,
++      995,  995,  995,  996,  938,  996,  996,  996,  996,  996,
+       996,  996,  996,  996,  996,  996,  996,  996,  996,  996,
+-      996,  997,  997,  997,  997,  997,  997,  997,  997,  997,
+-      997,  997,  997,  997,  997,  997,  997,  997,  997,  998,
+-      912,  998,  998,  998,  911,  998,  998,  998,  910,  909,
+-      998,  998,  907,  905,  902,  998,  998,  999,  999,  999,
+-      999,  901,  900,  999,  999,  999, 1000,  899,  898, 1000,
+-     1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000,
+-     1000, 1000, 1000, 1000, 1001, 1001, 1001, 1001,  897,  896,
+-     1001, 1001, 1001, 1002,  893, 1002, 1002, 1002, 1002, 1002,
+-     1002, 1002, 1002, 1002, 1002, 1002, 1002, 1002, 1002, 1002,
+-
+-     1002, 1003,  892, 1003, 1003, 1003, 1003, 1003, 1003, 1003,
+-     1003, 1003, 1003,  891, 1003, 1003, 1003, 1003, 1003, 1004,
+-      887, 1004,  885,  884, 1004, 1004, 1004, 1004,  883,  882,
+-     1004, 1004, 1005,  881, 1005, 1005, 1005, 1005, 1005, 1005,
+-     1005, 1005, 1005, 1005, 1005, 1005, 1005, 1005, 1005, 1005,
+-     1006, 1006, 1006, 1006,  880,  879, 1006, 1006, 1006, 1007,
+-     1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+-     1007, 1007, 1007, 1007, 1007, 1007, 1007, 1008, 1008, 1008,
+-     1008, 1008,  878, 1008, 1008, 1008, 1008, 1008, 1008, 1008,
+-     1008, 1008, 1008, 1008, 1008, 1009,  877, 1009,  876, 1009,
+-
+-     1009, 1009, 1009, 1009, 1009, 1009,  875, 1009, 1009, 1009,
+-     1009, 1009, 1009, 1010,  874, 1010, 1010, 1010, 1010, 1010,
+-     1010, 1010, 1010, 1010, 1010, 1010, 1010, 1010, 1010, 1010,
+-     1010, 1011,  873, 1011, 1011, 1011,  871, 1011, 1011, 1011,
+-      870,  869, 1011, 1011,  868,  867,  866, 1011, 1011, 1012,
+-     1012, 1012, 1012,  865,  864, 1012, 1012, 1012, 1013,  863,
+-     1013, 1013, 1013, 1013, 1013, 1013, 1013, 1013, 1013, 1013,
+-     1013, 1013, 1013, 1013, 1013, 1013, 1014, 1014,  860, 1014,
+-     1014,  859,  858,  857, 1014, 1014, 1016,  856, 1016, 1016,
+-     1016, 1016, 1016, 1016, 1016, 1016, 1016, 1016, 1016, 1016,
++      996,  996,  997,  997,  997,  937,  935,  933,  997,  997,
++      997,  998,  932,  998,  998,  998,  998,  998,  998,  998,
++      998,  998,  998,  998,  998,  998,  998,  998,  998,  998,
++      999,  931,  999,  999,  999,  999,  999,  999,  999,  999,
++
++      999,  999,  999,  999,  999,  999,  999,  999,  999, 1000,
++      930, 1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000,
++     1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000, 1001, 1001,
++     1001, 1001, 1001, 1001, 1001, 1001, 1001, 1001, 1001, 1001,
++     1001, 1001, 1001, 1001, 1001, 1001, 1001, 1002,  928, 1002,
++     1002, 1002,  927, 1002, 1002, 1002,  926,  925, 1002, 1002,
++     1002,  922,  919,  918, 1002, 1002, 1003, 1003, 1003, 1003,
++      917,  916,  915, 1003, 1003, 1003, 1004,  914,  913, 1004,
++     1004, 1004, 1004, 1004, 1004, 1004, 1004, 1004, 1004, 1004,
++     1004, 1004, 1004, 1004, 1004, 1005, 1005, 1005, 1005,  911,
++
++      909,  906, 1005, 1005, 1005, 1006,  905, 1006, 1006, 1006,
++     1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006,
++     1006, 1006, 1006, 1006, 1007,  904, 1007, 1007, 1007, 1007,
++     1007, 1007, 1007, 1007, 1007, 1007, 1007,  903, 1007, 1007,
++     1007, 1007, 1007, 1008,  902, 1008,  901,  900, 1008, 1008,
++     1008, 1008,  897,  896, 1008, 1008, 1008, 1009,  895, 1009,
++     1009, 1009, 1009, 1009, 1009, 1009, 1009, 1009, 1009, 1009,
++     1009, 1009, 1009, 1009, 1009, 1009, 1010, 1010, 1010, 1010,
++      891,  889,  888, 1010, 1010, 1010, 1011, 1011, 1011, 1011,
++     1011, 1011, 1011, 1011, 1011, 1011, 1011, 1011, 1011, 1011,
++
++     1011, 1011, 1011, 1011, 1011, 1012, 1012, 1012, 1012, 1012,
++      887, 1012, 1012, 1012, 1012, 1012,  886, 1012,  885, 1012,
++     1012, 1012, 1012, 1012, 1013,  884, 1013,  883, 1013, 1013,
++     1013, 1013, 1013, 1013, 1013, 1013,  882, 1013, 1013, 1013,
++     1013, 1013, 1013, 1014,  881, 1014, 1014, 1014, 1014, 1014,
++     1014, 1014, 1014, 1014, 1014, 1014, 1014, 1014, 1014, 1014,
++     1014, 1014, 1015,  880, 1015, 1015, 1015,  879, 1015, 1015,
++     1015,  878,  877, 1015, 1015, 1015,  875,  874,  873, 1015,
++     1015, 1016, 1016, 1016, 1016,  872,  871,  870, 1016, 1016,
++     1016, 1017,  869, 1017, 1017, 1017, 1017, 1017, 1017, 1017,
+ 
+-     1016, 1016, 1016, 1016, 1017,  854,  852, 1017, 1017, 1017,
+      1017, 1017, 1017, 1017, 1017, 1017, 1017, 1017, 1017, 1017,
+-     1018,  851, 1018, 1018, 1018, 1018, 1018, 1018, 1018, 1018,
+-     1018, 1018, 1018, 1018, 1018, 1018, 1018, 1018, 1019,  850,
+-     1019, 1019, 1019, 1019, 1019, 1019, 1019, 1019, 1019, 1019,
+-     1019, 1019, 1019, 1019, 1019, 1019, 1020, 1020,  849,  848,
+-     1020, 1020, 1020, 1021, 1021,  847,  846, 1021, 1021, 1021,
++     1018, 1018,  868, 1018, 1018,  867,  864,  863,  862, 1018,
++     1018, 1020,  861, 1020, 1020, 1020, 1020, 1020, 1020, 1020,
++     1020, 1020, 1020, 1020, 1020, 1020, 1020, 1020, 1020, 1020,
++     1021,  860,  858, 1021, 1021, 1021, 1021, 1021, 1021, 1021,
++     1021, 1021, 1021, 1021, 1021, 1021, 1021, 1022,  856, 1022,
+      1022, 1022, 1022, 1022, 1022, 1022, 1022, 1022, 1022, 1022,
+-     1022, 1022, 1022, 1022, 1022, 1022, 1022, 1022, 1023, 1023,
+-     1023, 1023,  845,  843, 1023, 1023, 1023, 1024, 1024, 1024,
++     1022, 1022, 1022, 1022, 1022, 1022, 1023,  855, 1023, 1023,
++     1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023,
++     1023, 1023, 1023, 1023, 1023, 1024, 1024,  854,  853,  852,
+ 
+-     1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024,
+-     1024, 1024, 1024, 1024, 1024, 1025,  842, 1025, 1025, 1025,
+-     1025, 1025, 1025, 1025, 1025, 1025, 1025,  841, 1025, 1025,
+-     1025, 1025, 1025, 1026,  840, 1026, 1026, 1026, 1026, 1026,
++     1024, 1024, 1024, 1025, 1025,  851,  850,  849, 1025, 1025,
++     1025, 1026, 1026, 1026, 1026, 1026, 1026, 1026, 1026, 1026,
+      1026, 1026, 1026, 1026, 1026, 1026, 1026, 1026, 1026, 1026,
+-     1026, 1027, 1027,  838,  837,  836,  835, 1027, 1028, 1028,
+-     1028, 1028,  834,  833, 1028, 1028, 1028,  832, 1028, 1029,
+-      831, 1029, 1029, 1029, 1029, 1029, 1029, 1029, 1029, 1029,
+-     1029, 1029, 1029, 1029, 1029, 1029, 1029, 1030,  830, 1030,
++     1027, 1027, 1027, 1027,  847,  846,  845, 1027, 1027, 1027,
++     1028, 1028, 1028, 1028, 1028, 1028, 1028, 1028, 1028, 1028,
++     1028, 1028, 1028, 1028, 1028, 1028, 1028, 1028, 1028, 1029,
++      844, 1029, 1029, 1029, 1029, 1029, 1029, 1029, 1029, 1029,
++     1029, 1029,  842, 1029, 1029, 1029, 1029, 1029, 1030,  841,
+      1030, 1030, 1030, 1030, 1030, 1030, 1030, 1030, 1030, 1030,
++     1030, 1030, 1030, 1030, 1030, 1030, 1030, 1031, 1031,  840,
+ 
+-     1030, 1030, 1030, 1030, 1030, 1031,  829, 1031, 1031, 1031,
+-     1031, 1031, 1031, 1031, 1031, 1031, 1031, 1031, 1031, 1031,
+-     1031, 1031, 1031, 1032,  828, 1032, 1032, 1032, 1032, 1032,
+-     1032, 1032, 1032, 1032, 1032, 1032, 1032, 1032, 1032, 1032,
+-     1032, 1033,  827, 1033, 1033, 1033, 1033, 1033, 1033, 1033,
+-     1033, 1033, 1033, 1033, 1033, 1033, 1033, 1033, 1033, 1034,
+-      826, 1034, 1034, 1034, 1034, 1034, 1034, 1034, 1034, 1034,
+-     1034, 1034, 1034, 1034, 1034, 1034, 1034, 1035, 1035, 1035,
++      839,  838,  837,  836, 1031, 1032, 1032, 1032, 1032,  835,
++      834,  833, 1032, 1032, 1032,  832, 1032, 1033,  831, 1033,
++     1033, 1033, 1033, 1033, 1033, 1033, 1033, 1033, 1033, 1033,
++     1033, 1033, 1033, 1033, 1033, 1033, 1034,  830, 1034, 1034,
++     1034, 1034, 1034, 1034, 1034, 1034, 1034, 1034, 1034, 1034,
++     1034, 1034, 1034, 1034, 1034, 1035,  829, 1035, 1035, 1035,
+      1035, 1035, 1035, 1035, 1035, 1035, 1035, 1035, 1035, 1035,
+-     1035, 1035, 1035, 1035, 1035, 1036,  825, 1036, 1036, 1036,
++     1035, 1035, 1035, 1035, 1036,  814, 1036, 1036, 1036, 1036,
++     1036, 1036, 1036, 1036, 1036, 1036, 1036, 1036, 1036, 1036,
++     1036, 1036, 1036, 1037,  813, 1037, 1037, 1037, 1037, 1037,
+ 
+-      810, 1036, 1036, 1036,  809,  808, 1036, 1036,  807,  805,
+-      804, 1036, 1036, 1037, 1037, 1037, 1037,  803,  801, 1037,
+-     1037, 1037, 1038,  800,  799, 1038, 1038, 1038, 1038, 1038,
++     1037, 1037, 1037, 1037, 1037, 1037, 1037, 1037, 1037, 1037,
++     1037, 1037, 1038,  812, 1038, 1038, 1038, 1038, 1038, 1038,
+      1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038,
+-     1039, 1039, 1039, 1039,  798,  797, 1039, 1039, 1039, 1040,
+-     1040,  796,  794,  793, 1040, 1040, 1041,  792, 1041,  790,
+-      789, 1041, 1041, 1041, 1041,  788,  787, 1041, 1041, 1042,
+-      786, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042,
+-     1042, 1042, 1042, 1042, 1042, 1042, 1042, 1043, 1043, 1043,
+-     1043,  785,  784, 1043, 1043, 1043, 1044, 1044, 1044, 1044,
+-
+-     1044, 1044, 1044, 1044, 1044, 1044, 1044, 1044, 1044, 1044,
+-     1044, 1044, 1044, 1044, 1045, 1045, 1045, 1045, 1045,  783,
+-     1045, 1045, 1045, 1045, 1045, 1045, 1045, 1045, 1045, 1045,
+-     1045, 1045, 1046,  781, 1046,  780, 1046, 1046, 1046, 1046,
+-     1046, 1046, 1046,  779, 1046, 1046, 1046, 1046, 1046, 1046,
+-     1047,  777, 1047, 1047, 1047,  776, 1047, 1047, 1047,  775,
+-      774, 1047, 1047,  773,  772,  771, 1047, 1047, 1048, 1048,
+-     1048, 1048,  770,  769, 1048, 1048, 1048, 1049,  768, 1049,
+-     1049, 1049, 1049, 1049, 1049, 1049, 1049, 1049, 1049, 1049,
+-     1049, 1049, 1049, 1049, 1049, 1050, 1050,  767, 1050, 1050,
+-
+-      766,  765,  764, 1050, 1050, 1051,  763, 1051, 1051, 1051,
+-     1051, 1051, 1051, 1051, 1051, 1051, 1051, 1051, 1051, 1051,
+-     1051, 1051, 1051, 1052,  762,  761, 1052, 1052, 1052, 1052,
+-     1052, 1052, 1052, 1052, 1052, 1052, 1052, 1052, 1052, 1053,
+-      760, 1053, 1053, 1053, 1053, 1053, 1053, 1053, 1053, 1053,
+-     1053, 1053, 1053, 1053, 1053, 1053, 1053, 1054,  759, 1054,
+-     1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054,
+-     1054, 1054, 1054, 1054, 1054, 1055, 1055, 1055, 1055, 1055,
++     1038, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039,
++     1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039,
++     1040,  811, 1040, 1040, 1040,  809, 1040, 1040, 1040,  808,
++      807, 1040, 1040, 1040,  805,  804,  803, 1040, 1040, 1041,
++     1041, 1041, 1041,  802,  801,  800, 1041, 1041, 1041, 1042,
++      798,  797, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042,
++     1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1043, 1043,
++
++     1043, 1043,  796,  794,  793, 1043, 1043, 1043, 1044, 1044,
++      792,  791,  790,  789, 1044, 1044, 1045,  788, 1045,  787,
++      785, 1045, 1045, 1045, 1045,  784,  783, 1045, 1045, 1045,
++     1046,  781, 1046, 1046, 1046, 1046, 1046, 1046, 1046, 1046,
++     1046, 1046, 1046, 1046, 1046, 1046, 1046, 1046, 1046, 1047,
++     1047, 1047, 1047,  780,  779,  778, 1047, 1047, 1047, 1048,
++     1048, 1048, 1048, 1048, 1048, 1048, 1048, 1048, 1048, 1048,
++     1048, 1048, 1048, 1048, 1048, 1048, 1048, 1048, 1049, 1049,
++     1049, 1049, 1049,  777, 1049, 1049, 1049, 1049, 1049,  776,
++     1049,  775, 1049, 1049, 1049, 1049, 1049, 1050,  774, 1050,
++
++      773, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050,  772,
++     1050, 1050, 1050, 1050, 1050, 1050, 1051,  771, 1051, 1051,
++     1051,  770, 1051, 1051, 1051,  769,  768, 1051, 1051, 1051,
++      767,  766,  765, 1051, 1051, 1052, 1052, 1052, 1052,  764,
++      763,  760, 1052, 1052, 1052, 1053,  758, 1053, 1053, 1053,
++     1053, 1053, 1053, 1053, 1053, 1053, 1053, 1053, 1053, 1053,
++     1053, 1053, 1053, 1053, 1054, 1054,  757, 1054, 1054,  756,
++      755,  754,  753, 1054, 1054, 1055,  752, 1055, 1055, 1055,
+      1055, 1055, 1055, 1055, 1055, 1055, 1055, 1055, 1055, 1055,
+-     1055, 1055, 1055, 1056, 1056, 1056, 1056,  756,  754, 1056,
++     1055, 1055, 1055, 1055, 1056,  750,  749, 1056, 1056, 1056,
+ 
+-     1056, 1056, 1057, 1057, 1057, 1057,  753,  752, 1057, 1057,
+-     1057, 1058, 1058, 1058, 1058, 1058, 1058, 1058, 1058, 1058,
++     1056, 1056, 1056, 1056, 1056, 1056, 1056, 1056, 1056, 1056,
++     1056, 1057,  748, 1057, 1057, 1057, 1057, 1057, 1057, 1057,
++     1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057,
++     1058,  745, 1058, 1058, 1058, 1058, 1058, 1058, 1058, 1058,
+      1058, 1058, 1058, 1058, 1058, 1058, 1058, 1058, 1058, 1059,
+      1059, 1059, 1059, 1059, 1059, 1059, 1059, 1059, 1059, 1059,
+-     1059, 1059, 1059, 1059, 1059, 1059, 1059, 1060,  751, 1060,
+-     1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060,  750,
+-     1060, 1060, 1060, 1060, 1060, 1061, 1061,  749,  748,  746,
+-      745, 1061, 1062, 1062, 1062, 1062,  744,  741, 1062, 1062,
+-     1062,  740, 1062, 1063,  739, 1063, 1063, 1063, 1063, 1063,
+-     1063, 1063, 1063, 1063, 1063, 1063, 1063, 1063, 1063, 1063,
++     1059, 1059, 1059, 1059, 1059, 1059, 1059, 1059, 1060, 1060,
++     1060, 1060,  744,  743,  742, 1060, 1060, 1060, 1061, 1061,
++     1061, 1061,  738,  737,  735, 1061, 1061, 1061, 1062, 1062,
++     1062, 1062, 1062, 1062, 1062, 1062, 1062, 1062, 1062, 1062,
+ 
+-     1063, 1064,  738, 1064, 1064, 1064, 1064, 1064, 1064, 1064,
+-     1064, 1064, 1064, 1064, 1064, 1064, 1064, 1064, 1064, 1065,
+-      734, 1065, 1065, 1065, 1065, 1065, 1065, 1065, 1065, 1065,
+-     1065, 1065, 1065, 1065, 1065, 1065, 1065, 1066, 1066, 1066,
+-     1066,  733,  731, 1066, 1066, 1066, 1067,  729, 1067, 1067,
++     1062, 1062, 1062, 1062, 1062, 1062, 1062, 1063, 1063, 1063,
++     1063, 1063, 1063, 1063, 1063, 1063, 1063, 1063, 1063, 1063,
++     1063, 1063, 1063, 1063, 1063, 1063, 1064,  733, 1064, 1064,
++     1064, 1064, 1064, 1064, 1064, 1064, 1064, 1064, 1064,  732,
++     1064, 1064, 1064, 1064, 1064, 1065, 1065,  731,  730,  729,
++      727,  725, 1065, 1066, 1066, 1066, 1066,  724,  723,  722,
++     1066, 1066, 1066,  721, 1066, 1067,  720, 1067, 1067, 1067,
+      1067, 1067, 1067, 1067, 1067, 1067, 1067, 1067, 1067, 1067,
+-     1067, 1067, 1067, 1067, 1068, 1068, 1068, 1068, 1068, 1068,
++     1067, 1067, 1067, 1067, 1068,  719, 1068, 1068, 1068, 1068,
+      1068, 1068, 1068, 1068, 1068, 1068, 1068, 1068, 1068, 1068,
+-     1068, 1068, 1069, 1069, 1069, 1069, 1069, 1069, 1069, 1069,
+-     1069, 1069, 1069, 1069, 1069, 1069, 1069, 1069, 1069, 1069,
+ 
+-      728,  727,  726,  725,  723,  721,  720,  719,  718,  717,
+-      716,  715,  713,  712,  711,  710,  709,  708,  707,  706,
+-      705,  704,  703,  701,  699,  692,  690,  687,  686,  685,
+-      684,  683,  682,  681,  679,  677,  675,  673,  672,  671,
+-      670,  669,  668,  667,  666,  665,  664,  663,  662,  661,
+-      660,  657,  656,  655,  636,  635,  631,  630,  627,  626,
+-      624,  623,  622,  621,  620,  619,  618,  617,  616,  615,
+-      614,  613,  612,  611,  610,  608,  607,  606,  605,  603,
+-      602,  601,  600,  599,  598,  597,  596,  595,  594,  593,
+-      591,  590,  588,  587,  585,  583,  580,  578,  577,  576,
+-
+-      575,  561,  560,  559,  558,  552,  551,  547,  546,  545,
+-      541,  540,  539,  538,  537,  536,  535,  534,  533,  532,
+-      531,  530,  527,  526,  525,  524,  523,  522,  521,  520,
+-      519,  517,  516,  515,  514,  513,  512,  511,  509,  508,
+-      507,  506,  503,  502,  500,  499,  498,  497,  496,  495,
+-      494,  491,  490,  489,  488,  476,  474,  473,  472,  471,
+-      466,  462,  458,  457,  456,  449,  448,  447,  446,  445,
+-      444,  443,  442,  441,  440,  438,  437,  436,  435,  434,
+-      432,  431,  430,  429,  428,  427,  426,  425,  424,  423,
+-      422,  421,  420,  419,  418,  417,  416,  415,  413,  412,
+-
+-      411,  409,  408,  407,  406,  405,  404,  403,  402,  401,
+-      400,  399,  396,  395,  384,  379,  378,  375,  373,  369,
+-      360,  351,  349,  348,  347,  345,  340,  335,  333,  332,
+-      330,  327,  325,  324,  322,  320,  319,  318,  316,  315,
+-      314,  313,  311,  310,  309,  307,  306,  303,  302,  300,
+-      298,  297,  296,  292,  279,  278,  260,  259,  258,  255,
+-      252,  251,  246,  243,  238,  234,  233,  232,  231,  228,
+-      220,  219,  216,  215,  208,  200,  198,  194,  189,  185,
+-      182,  181,  180,  179,  178,  177,  176,  174,  171,  170,
+-      169,  166,  165,  160,  159,  158,  157,  155,  153,  152,
+-
+-      150,  148,  147,  141,  138,  129,  128,  126,  123,  118,
+-      116,  111,  107,  101,   96,   94,   93,   90,   88,   86,
+-       85,   84,   81,   77,   75,   73,   69,   67,   61,   57,
+-       52,   49,   45,   41,   16,   15,   10,    8,    7,  972,
+-      972,  972,  972,  972,  972,  972,  972,  972,  972,  972,
+-      972,  972,  972,  972,  972,  972,  972,  972,  972,  972,
+-      972,  972,  972,  972,  972,  972,  972,  972,  972,  972,
+-      972,  972,  972,  972,  972,  972,  972,  972,  972,  972,
+-      972,  972,  972,  972,  972,  972,  972,  972,  972,  972,
+-      972,  972,  972,  972,  972,  972,  972,  972,  972
++     1068, 1068, 1068, 1069,  717, 1069, 1069, 1069, 1069, 1069,
++     1069, 1069, 1069, 1069, 1069, 1069, 1069, 1069, 1069, 1069,
++     1069, 1069, 1070, 1070, 1070, 1070,  716,  715,  714, 1070,
++     1070, 1070, 1071,  713, 1071, 1071, 1071, 1071, 1071, 1071,
++     1071, 1071, 1071, 1071, 1071, 1071, 1071, 1071, 1071, 1071,
++     1071, 1072, 1072, 1072, 1072, 1072, 1072, 1072, 1072, 1072,
++     1072, 1072, 1072, 1072, 1072, 1072, 1072, 1072, 1072, 1072,
++     1073, 1073, 1073, 1073, 1073, 1073, 1073, 1073, 1073, 1073,
++     1073, 1073, 1073, 1073, 1073, 1073, 1073, 1073, 1073,  712,
++      711,  710,  709,  708,  707,  705,  703,  696,  694,  691,
++
++      690,  689,  688,  687,  686,  685,  683,  681,  679,  677,
++      676,  675,  674,  673,  672,  671,  670,  669,  668,  667,
++      666,  665,  664,  661,  660,  659,  640,  639,  635,  634,
++      631,  630,  628,  627,  626,  625,  624,  623,  622,  621,
++      620,  619,  618,  617,  616,  615,  614,  612,  611,  610,
++      609,  607,  606,  605,  604,  603,  602,  601,  600,  599,
++      598,  597,  595,  594,  592,  591,  589,  587,  584,  582,
++      581,  580,  579,  565,  564,  563,  562,  556,  555,  551,
++      550,  549,  545,  544,  543,  542,  541,  540,  539,  538,
++      537,  536,  535,  534,  531,  530,  529,  528,  527,  526,
++
++      525,  524,  523,  521,  520,  519,  518,  517,  516,  515,
++      513,  512,  511,  510,  507,  506,  504,  503,  502,  501,
++      500,  499,  498,  495,  494,  493,  492,  480,  478,  477,
++      476,  475,  470,  466,  462,  461,  460,  453,  452,  451,
++      450,  449,  448,  447,  446,  445,  444,  442,  441,  440,
++      439,  438,  436,  435,  434,  433,  432,  431,  430,  429,
++      428,  427,  426,  425,  424,  423,  422,  421,  420,  419,
++      417,  416,  415,  413,  412,  411,  410,  409,  408,  407,
++      406,  405,  404,  403,  400,  399,  388,  383,  382,  379,
++      377,  373,  364,  355,  353,  352,  351,  349,  344,  339,
++
++      337,  336,  334,  331,  329,  328,  326,  324,  323,  322,
++      320,  319,  318,  317,  315,  314,  313,  311,  310,  307,
++      306,  304,  302,  301,  300,  296,  281,  280,  262,  261,
++      260,  257,  254,  253,  248,  245,  240,  236,  235,  234,
++      233,  230,  222,  221,  218,  217,  210,  202,  200,  196,
++      191,  187,  184,  183,  182,  181,  180,  179,  178,  176,
++      173,  172,  171,  168,  167,  162,  161,  160,  159,  157,
++      155,  154,  152,  150,  149,  143,  140,  139,  138,  129,
++      128,  126,  123,  118,  116,  111,  107,  101,   96,   94,
++       93,   90,   88,   86,   85,   84,   81,   77,   75,   73,
+ 
++       69,   67,   61,   57,   52,   49,   45,   41,   16,   15,
++       10,    8,    7,  976,  976,  976,  976,  976,  976,  976,
++      976,  976,  976,  976,  976,  976,  976,  976,  976,  976,
++      976,  976,  976,  976,  976,  976,  976,  976,  976,  976,
++      976,  976,  976,  976,  976,  976,  976,  976,  976,  976,
++      976,  976,  976,  976,  976,  976,  976,  976,  976,  976,
++      976,  976,  976,  976,  976,  976,  976,  976,  976,  976,
++      976,  976,  976
+     } ;
+ 
+ static yy_state_type yy_last_accepting_state;
+@@ -1596,7 +1614,7 @@
+ 
+ 
+ 
+-#line 1600 "scan.c"
++#line 1618 "scan.c"
+ 
+ #define INITIAL 0
+ #define SECT2 1
+@@ -1619,11 +1637,13 @@
+ #define LINEDIR 18
+ #define CODEBLOCK_MATCH_BRACE 19
+ 
++#ifndef YY_NO_UNISTD_H
+ /* Special case for "unistd.h", since it is non-ANSI. We include it way
+  * down here because we want the user's section 1 to have been scanned first.
+  * The user has a chance to override it with an option.
+  */
+ #include <unistd.h>
++#endif
+ 
+ #ifndef YY_EXTRA_TYPE
+ #define YY_EXTRA_TYPE void *
+@@ -1786,7 +1806,7 @@
+ 	Char nmdef[MAXLINE];
+ 
+ 
+-#line 1790 "scan.c"
++#line 1810 "scan.c"
+ 
+ 	if ( (yy_init) )
+ 		{
+@@ -1840,13 +1860,13 @@
+ 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+ 				{
+ 				yy_current_state = (int) yy_def[yy_current_state];
+-				if ( yy_current_state >= 973 )
++				if ( yy_current_state >= 977 )
+ 					yy_c = yy_meta[(unsigned int) yy_c];
+ 				}
+ 			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+ 			++yy_cp;
+ 			}
+-		while ( yy_base[yy_current_state] != 3240 );
++		while ( yy_base[yy_current_state] != 3314 );
+ 
+ yy_find_action:
+ 		yy_act = yy_accept[yy_current_state];
+@@ -2029,55 +2049,73 @@
+ ACTION_ECHO;
+ 	YY_BREAK
+ case 24:
+-/* rule 24 can match eol */
+ YY_RULE_SETUP
+ #line 198 "scan.l"
++ACTION_ECHO;
++	YY_BREAK
++case 25:
++/* rule 25 can match eol */
++YY_RULE_SETUP
++#line 199 "scan.l"
+ ++linenum; ACTION_ECHO;
+ 	YY_BREAK
++case 26:
++YY_RULE_SETUP
++#line 200 "scan.l"
++add_action("[" "[]" "]m4_" "userquote_start()");
++	YY_BREAK
++case 27:
++YY_RULE_SETUP
++#line 201 "scan.l"
++add_action("[" "[]" "]m4_" "userquote_end()");
++	YY_BREAK
++/* Macros need to be clearly separated from surrounding
++			 * text and this file needs to go through flex untouched.
++			 */
+ 
+ 
+-case 25:
+-/* rule 25 can match eol */
++case 28:
++/* rule 28 can match eol */
+ YY_RULE_SETUP
+-#line 202 "scan.l"
++#line 208 "scan.l"
+ yy_pop_state();
+ 	YY_BREAK
+-case 26:
++case 29:
+ YY_RULE_SETUP
+-#line 203 "scan.l"
++#line 209 "scan.l"
+ linenum = myctoi( yytext );
+ 	YY_BREAK
+-case 27:
++case 30:
+ YY_RULE_SETUP
+-#line 205 "scan.l"
++#line 211 "scan.l"
+ {
+ 			flex_free( (void *) infilename );
+ 			infilename = copy_string( yytext + 1 );
+ 			infilename[strlen( infilename ) - 1] = '\0';
+ 			}
+ 	YY_BREAK
+-case 28:
++case 31:
+ YY_RULE_SETUP
+-#line 210 "scan.l"
++#line 216 "scan.l"
+ /* ignore spurious characters */
+ 	YY_BREAK
+ 
+ 
+-case 29:
+-/* rule 29 can match eol */
++case 32:
++/* rule 32 can match eol */
+ YY_RULE_SETUP
+-#line 214 "scan.l"
++#line 220 "scan.l"
+ ++linenum; BEGIN(INITIAL);
+ 	YY_BREAK
+-case 30:
++case 33:
+ YY_RULE_SETUP
+-#line 216 "scan.l"
++#line 222 "scan.l"
+ ACTION_ECHO;
+ 	YY_BREAK
+-case 31:
+-/* rule 31 can match eol */
++case 34:
++/* rule 34 can match eol */
+ YY_RULE_SETUP
+-#line 218 "scan.l"
++#line 224 "scan.l"
+ {
+ 			++linenum;
+ 			ACTION_ECHO;
+@@ -2087,9 +2125,9 @@
+ 	YY_BREAK
+ 
+ 
+-case 32:
++case 35:
+ YY_RULE_SETUP
+-#line 227 "scan.l"
++#line 233 "scan.l"
+ {
+                 if( --brace_depth == 0){
+                     /* TODO: Matched. */
+@@ -2098,32 +2136,32 @@
+                     buf_strnappend(&top_buf, yytext, yyleng);
+             }
+ 	YY_BREAK
+-case 33:
++case 36:
+ YY_RULE_SETUP
+-#line 235 "scan.l"
++#line 241 "scan.l"
+ {   
+                 brace_depth++;
+                 buf_strnappend(&top_buf, yytext, yyleng);
+             }
+ 	YY_BREAK
+-case 34:
+-/* rule 34 can match eol */
++case 37:
++/* rule 37 can match eol */
+ YY_RULE_SETUP
+-#line 240 "scan.l"
++#line 246 "scan.l"
+ {
+                 ++linenum;
+                 buf_strnappend(&top_buf, yytext, yyleng);
+             }
+ 	YY_BREAK
+-case 35:
++case 38:
+ YY_RULE_SETUP
+-#line 245 "scan.l"
++#line 251 "scan.l"
+ {
+                 buf_strnappend(&top_buf, yytext, yyleng);
+                 }
+ 	YY_BREAK
+ case YY_STATE_EOF(CODEBLOCK_MATCH_BRACE):
+-#line 249 "scan.l"
++#line 255 "scan.l"
+ {
+                 linenum = brace_start_line;
+                 synerr(_("Unmatched '{'"));
+@@ -2132,14 +2170,14 @@
+ 	YY_BREAK
+ 
+ 
+-case 36:
++case 39:
+ YY_RULE_SETUP
+-#line 258 "scan.l"
++#line 264 "scan.l"
+ /* separates name and definition */
+ 	YY_BREAK
+-case 37:
++case 40:
+ YY_RULE_SETUP
+-#line 260 "scan.l"
++#line 266 "scan.l"
+ {
+  		        if(yyleng < MAXLINE)
+  		         {
+@@ -2162,10 +2200,10 @@
+ 			didadef = true;
+ 			}
+ 	YY_BREAK
+-case 38:
+-/* rule 38 can match eol */
++case 41:
++/* rule 41 can match eol */
+ YY_RULE_SETUP
+-#line 282 "scan.l"
++#line 288 "scan.l"
+ {
+ 			if ( ! didadef )
+ 				synerr( _( "incomplete name definition" ) );
+@@ -2175,156 +2213,156 @@
+ 	YY_BREAK
+ 
+ 
+-case 39:
+-/* rule 39 can match eol */
++case 42:
++/* rule 42 can match eol */
+ YY_RULE_SETUP
+-#line 292 "scan.l"
++#line 298 "scan.l"
+ ++linenum; BEGIN(INITIAL);
+ 	YY_BREAK
+-case 40:
++case 43:
+ YY_RULE_SETUP
+-#line 293 "scan.l"
++#line 299 "scan.l"
+ option_sense = true;
+ 	YY_BREAK
+-case 41:
++case 44:
+ YY_RULE_SETUP
+-#line 295 "scan.l"
++#line 301 "scan.l"
+ return '=';
+ 	YY_BREAK
+-case 42:
++case 45:
+ YY_RULE_SETUP
+-#line 297 "scan.l"
++#line 303 "scan.l"
+ option_sense = ! option_sense;
+ 	YY_BREAK
+-case 43:
++case 46:
+ YY_RULE_SETUP
+-#line 299 "scan.l"
++#line 305 "scan.l"
+ csize = option_sense ? 128 : 256;
+ 	YY_BREAK
+-case 44:
++case 47:
+ YY_RULE_SETUP
+-#line 300 "scan.l"
++#line 306 "scan.l"
+ csize = option_sense ? 256 : 128;
+ 	YY_BREAK
+-case 45:
++case 48:
+ YY_RULE_SETUP
+-#line 302 "scan.l"
++#line 308 "scan.l"
+ long_align = option_sense;
+ 	YY_BREAK
+-case 46:
++case 49:
+ YY_RULE_SETUP
+-#line 303 "scan.l"
++#line 309 "scan.l"
+ {
+ 			ACTION_M4_IFDEF( "M4""_YY_ALWAYS_INTERACTIVE", option_sense );
+             interactive = option_sense;
+ 			}
+ 	YY_BREAK
+-case 47:
++case 50:
+ YY_RULE_SETUP
+-#line 307 "scan.l"
++#line 313 "scan.l"
+ yytext_is_array = option_sense;
+ 	YY_BREAK
+-case 48:
++case 51:
+ YY_RULE_SETUP
+-#line 308 "scan.l"
++#line 314 "scan.l"
+ ansi_func_defs = option_sense;
+ 	YY_BREAK
+-case 49:
++case 52:
+ YY_RULE_SETUP
+-#line 309 "scan.l"
++#line 315 "scan.l"
+ ansi_func_protos = option_sense;
+ 	YY_BREAK
+-case 50:
++case 53:
+ YY_RULE_SETUP
+-#line 310 "scan.l"
++#line 316 "scan.l"
+ backing_up_report = option_sense;
+ 	YY_BREAK
+-case 51:
++case 54:
+ YY_RULE_SETUP
+-#line 311 "scan.l"
++#line 317 "scan.l"
+ interactive = ! option_sense;
+ 	YY_BREAK
+-case 52:
++case 55:
+ YY_RULE_SETUP
+-#line 312 "scan.l"
++#line 318 "scan.l"
+ bison_bridge_lval = option_sense;
+ 	YY_BREAK
+-case 53:
++case 56:
+ YY_RULE_SETUP
+-#line 313 "scan.l"
++#line 319 "scan.l"
+ { if((bison_bridge_lloc = option_sense))
+                             bison_bridge_lval = true;
+                      }
+ 	YY_BREAK
+-case 54:
++case 57:
+ YY_RULE_SETUP
+-#line 316 "scan.l"
++#line 322 "scan.l"
+ C_plus_plus = option_sense;
+ 	YY_BREAK
+-case 55:
++case 58:
+ YY_RULE_SETUP
+-#line 317 "scan.l"
++#line 323 "scan.l"
+ caseins = ! option_sense;
+ 	YY_BREAK
+-case 56:
++case 59:
+ YY_RULE_SETUP
+-#line 318 "scan.l"
++#line 324 "scan.l"
+ caseins = option_sense;
+ 	YY_BREAK
+-case 57:
++case 60:
+ YY_RULE_SETUP
+-#line 319 "scan.l"
++#line 325 "scan.l"
+ ddebug = option_sense;
+ 	YY_BREAK
+-case 58:
++case 61:
+ YY_RULE_SETUP
+-#line 320 "scan.l"
++#line 326 "scan.l"
+ spprdflt = ! option_sense;
+ 	YY_BREAK
+-case 59:
++case 62:
+ YY_RULE_SETUP
+-#line 321 "scan.l"
++#line 327 "scan.l"
+ useecs = option_sense;
+ 	YY_BREAK
+-case 60:
++case 63:
+ YY_RULE_SETUP
+-#line 322 "scan.l"
++#line 328 "scan.l"
+ {
+ 			useecs = usemecs = false;
+ 			use_read = fullspd = true;
+ 			}
+ 	YY_BREAK
+-case 61:
++case 64:
+ YY_RULE_SETUP
+-#line 326 "scan.l"
++#line 332 "scan.l"
+ {
+ 			useecs = usemecs = false;
+ 			use_read = fulltbl = true;
+ 			}
+ 	YY_BREAK
+-case 62:
++case 65:
+ YY_RULE_SETUP
+-#line 330 "scan.l"
++#line 336 "scan.l"
+ ACTION_IFDEF("YY_NO_INPUT", ! option_sense);
+ 	YY_BREAK
+-case 63:
++case 66:
+ YY_RULE_SETUP
+-#line 331 "scan.l"
++#line 337 "scan.l"
+ interactive = option_sense;
+ 	YY_BREAK
+-case 64:
++case 67:
+ YY_RULE_SETUP
+-#line 332 "scan.l"
++#line 338 "scan.l"
+ lex_compat = option_sense;
+ 	YY_BREAK
+-case 65:
++case 68:
+ YY_RULE_SETUP
+-#line 333 "scan.l"
++#line 339 "scan.l"
+ posix_compat = option_sense;
+ 	YY_BREAK
+-case 66:
++case 69:
+ YY_RULE_SETUP
+-#line 334 "scan.l"
++#line 340 "scan.l"
+ {
+ 			ACTION_M4_IFDEF( "M4""_YY_MAIN", option_sense);
+             /* Override yywrap */
+@@ -2332,256 +2370,256 @@
+                 do_yywrap = false;
+ 			}
+ 	YY_BREAK
+-case 67:
++case 70:
+ YY_RULE_SETUP
+-#line 340 "scan.l"
++#line 346 "scan.l"
+ usemecs = option_sense;
+ 	YY_BREAK
+-case 68:
++case 71:
+ YY_RULE_SETUP
+-#line 341 "scan.l"
++#line 347 "scan.l"
+ {
+ 			ACTION_M4_IFDEF( "M4""_YY_NEVER_INTERACTIVE", option_sense );
+             interactive = !option_sense;
+ 			}
+ 	YY_BREAK
+-case 69:
++case 72:
+ YY_RULE_SETUP
+-#line 345 "scan.l"
++#line 351 "scan.l"
+ performance_report += option_sense ? 1 : -1;
+ 	YY_BREAK
+-case 70:
++case 73:
+ YY_RULE_SETUP
+-#line 346 "scan.l"
++#line 352 "scan.l"
+ yytext_is_array = ! option_sense;
+ 	YY_BREAK
+-case 71:
++case 74:
+ YY_RULE_SETUP
+-#line 347 "scan.l"
++#line 353 "scan.l"
+ use_read = option_sense;
+ 	YY_BREAK
+-case 72:
++case 75:
+ YY_RULE_SETUP
+-#line 348 "scan.l"
++#line 354 "scan.l"
+ reentrant = option_sense;
+ 	YY_BREAK
+-case 73:
++case 76:
+ YY_RULE_SETUP
+-#line 349 "scan.l"
++#line 355 "scan.l"
+ reject_really_used = option_sense;
+ 	YY_BREAK
+-case 74:
++case 77:
+ YY_RULE_SETUP
+-#line 350 "scan.l"
++#line 356 "scan.l"
+ ACTION_M4_IFDEF( "M4""_YY_STACK_USED", option_sense );
+ 	YY_BREAK
+-case 75:
++case 78:
+ YY_RULE_SETUP
+-#line 351 "scan.l"
++#line 357 "scan.l"
+ do_stdinit = option_sense;
+ 	YY_BREAK
+-case 76:
++case 79:
+ YY_RULE_SETUP
+-#line 352 "scan.l"
++#line 358 "scan.l"
+ use_stdout = option_sense;
+ 	YY_BREAK
+-case 77:
++case 80:
+ YY_RULE_SETUP
+-#line 353 "scan.l"
++#line 359 "scan.l"
+ ACTION_IFDEF("YY_NO_UNISTD_H", ! option_sense);
+ 	YY_BREAK
+-case 78:
++case 81:
+ YY_RULE_SETUP
+-#line 354 "scan.l"
++#line 360 "scan.l"
+ ACTION_M4_IFDEF("M4""_YY_NO_UNPUT", ! option_sense);
+ 	YY_BREAK
+-case 79:
++case 82:
+ YY_RULE_SETUP
+-#line 355 "scan.l"
++#line 361 "scan.l"
+ printstats = option_sense;
+ 	YY_BREAK
+-case 80:
++case 83:
+ YY_RULE_SETUP
+-#line 356 "scan.l"
++#line 362 "scan.l"
+ nowarn = ! option_sense;
+ 	YY_BREAK
+-case 81:
++case 84:
+ YY_RULE_SETUP
+-#line 357 "scan.l"
++#line 363 "scan.l"
+ do_yylineno = option_sense; ACTION_M4_IFDEF("M4""_YY_USE_LINENO", option_sense);
+ 	YY_BREAK
+-case 82:
++case 85:
+ YY_RULE_SETUP
+-#line 358 "scan.l"
++#line 364 "scan.l"
+ yymore_really_used = option_sense;
+ 	YY_BREAK
+-case 83:
++case 86:
+ YY_RULE_SETUP
+-#line 359 "scan.l"
++#line 365 "scan.l"
+ do_yywrap = option_sense;
+ 	YY_BREAK
+-case 84:
++case 87:
+ YY_RULE_SETUP
+-#line 361 "scan.l"
++#line 367 "scan.l"
+ ACTION_M4_IFDEF("M4""_YY_NO_PUSH_STATE", ! option_sense);
+ 	YY_BREAK
+-case 85:
++case 88:
+ YY_RULE_SETUP
+-#line 362 "scan.l"
++#line 368 "scan.l"
+ ACTION_M4_IFDEF("M4""_YY_NO_POP_STATE", ! option_sense);
+ 	YY_BREAK
+-case 86:
++case 89:
+ YY_RULE_SETUP
+-#line 363 "scan.l"
++#line 369 "scan.l"
+ ACTION_M4_IFDEF("M4""_YY_NO_TOP_STATE", ! option_sense);
+ 	YY_BREAK
+-case 87:
++case 90:
+ YY_RULE_SETUP
+-#line 365 "scan.l"
++#line 371 "scan.l"
+ ACTION_M4_IFDEF("M4""_YY_NO_SCAN_BUFFER", ! option_sense);
+ 	YY_BREAK
+-case 88:
++case 91:
+ YY_RULE_SETUP
+-#line 366 "scan.l"
++#line 372 "scan.l"
+ ACTION_M4_IFDEF("M4""_YY_NO_SCAN_BYTES", ! option_sense);
+ 	YY_BREAK
+-case 89:
++case 92:
+ YY_RULE_SETUP
+-#line 367 "scan.l"
++#line 373 "scan.l"
+ ACTION_M4_IFDEF("M4""_YY_NO_SCAN_STRING", ! option_sense);
+ 	YY_BREAK
+-case 90:
++case 93:
+ YY_RULE_SETUP
+-#line 369 "scan.l"
++#line 375 "scan.l"
+ ACTION_M4_IFDEF("M4""_YY_NO_FLEX_ALLOC", ! option_sense);
+ 	YY_BREAK
+-case 91:
++case 94:
+ YY_RULE_SETUP
+-#line 370 "scan.l"
++#line 376 "scan.l"
+ ACTION_M4_IFDEF("M4""_YY_NO_FLEX_REALLOC", ! option_sense);
+ 	YY_BREAK
+-case 92:
++case 95:
+ YY_RULE_SETUP
+-#line 371 "scan.l"
++#line 377 "scan.l"
+ ACTION_M4_IFDEF("M4""_YY_NO_FLEX_FREE", ! option_sense);
+ 	YY_BREAK
+-case 93:
++case 96:
+ YY_RULE_SETUP
+-#line 373 "scan.l"
++#line 379 "scan.l"
+ ACTION_M4_IFDEF("M4""_YY_NO_GET_DEBUG", ! option_sense);
+ 	YY_BREAK
+-case 94:
++case 97:
+ YY_RULE_SETUP
+-#line 374 "scan.l"
++#line 380 "scan.l"
+ ACTION_M4_IFDEF("M4""_YY_NO_SET_DEBUG", ! option_sense);
+ 	YY_BREAK
+-case 95:
++case 98:
+ YY_RULE_SETUP
+-#line 375 "scan.l"
++#line 381 "scan.l"
+ ACTION_M4_IFDEF("M4""_YY_NO_GET_EXTRA", ! option_sense);
+ 	YY_BREAK
+-case 96:
++case 99:
+ YY_RULE_SETUP
+-#line 376 "scan.l"
++#line 382 "scan.l"
+ ACTION_M4_IFDEF("M4""_YY_NO_SET_EXTRA", ! option_sense);
+ 	YY_BREAK
+-case 97:
++case 100:
+ YY_RULE_SETUP
+-#line 377 "scan.l"
++#line 383 "scan.l"
+ ACTION_M4_IFDEF("M4""_YY_NO_GET_LENG", ! option_sense);
+ 	YY_BREAK
+-case 98:
++case 101:
+ YY_RULE_SETUP
+-#line 378 "scan.l"
++#line 384 "scan.l"
+ ACTION_M4_IFDEF("M4""_YY_NO_GET_TEXT", ! option_sense);
+ 	YY_BREAK
+-case 99:
++case 102:
+ YY_RULE_SETUP
+-#line 379 "scan.l"
++#line 385 "scan.l"
+ ACTION_M4_IFDEF("M4""_YY_NO_GET_LINENO", ! option_sense);
+ 	YY_BREAK
+-case 100:
++case 103:
+ YY_RULE_SETUP
+-#line 380 "scan.l"
++#line 386 "scan.l"
+ ACTION_M4_IFDEF("M4""_YY_NO_SET_LINENO", ! option_sense);
+ 	YY_BREAK
+-case 101:
++case 104:
+ YY_RULE_SETUP
+-#line 381 "scan.l"
++#line 387 "scan.l"
+ ACTION_M4_IFDEF("M4""_YY_NO_GET_IN", ! option_sense);
+ 	YY_BREAK
+-case 102:
++case 105:
+ YY_RULE_SETUP
+-#line 382 "scan.l"
++#line 388 "scan.l"
+ ACTION_M4_IFDEF("M4""_YY_NO_SET_IN", ! option_sense);
+ 	YY_BREAK
+-case 103:
++case 106:
+ YY_RULE_SETUP
+-#line 383 "scan.l"
++#line 389 "scan.l"
+ ACTION_M4_IFDEF("M4""_YY_NO_GET_OUT", ! option_sense);
+ 	YY_BREAK
+-case 104:
++case 107:
+ YY_RULE_SETUP
+-#line 384 "scan.l"
++#line 390 "scan.l"
+ ACTION_M4_IFDEF("M4""_YY_NO_SET_OUT", ! option_sense);
+ 	YY_BREAK
+-case 105:
++case 108:
+ YY_RULE_SETUP
+-#line 385 "scan.l"
++#line 391 "scan.l"
+ ACTION_M4_IFDEF("M4""_YY_NO_GET_LVAL", ! option_sense);
+ 	YY_BREAK
+-case 106:
++case 109:
+ YY_RULE_SETUP
+-#line 386 "scan.l"
++#line 392 "scan.l"
+ ACTION_M4_IFDEF("M4""_YY_NO_SET_LVAL", ! option_sense);
+ 	YY_BREAK
+-case 107:
++case 110:
+ YY_RULE_SETUP
+-#line 387 "scan.l"
++#line 393 "scan.l"
+ ACTION_M4_IFDEF("M4""_YY_NO_GET_LLOC", ! option_sense);
+ 	YY_BREAK
+-case 108:
++case 111:
+ YY_RULE_SETUP
+-#line 388 "scan.l"
++#line 394 "scan.l"
+ ACTION_M4_IFDEF("M4""_YY_NO_SET_LLOC", ! option_sense);
+ 	YY_BREAK
+-case 109:
++case 112:
+ YY_RULE_SETUP
+-#line 390 "scan.l"
++#line 396 "scan.l"
+ return OPT_OUTFILE;
+ 	YY_BREAK
+-case 110:
++case 113:
+ YY_RULE_SETUP
+-#line 391 "scan.l"
++#line 397 "scan.l"
+ return OPT_PREFIX;
+ 	YY_BREAK
+-case 111:
++case 114:
+ YY_RULE_SETUP
+-#line 392 "scan.l"
++#line 398 "scan.l"
+ return OPT_YYCLASS;
+ 	YY_BREAK
+-case 112:
++case 115:
+ YY_RULE_SETUP
+-#line 393 "scan.l"
++#line 399 "scan.l"
+ return OPT_HEADER;
+ 	YY_BREAK
+-case 113:
++case 116:
+ YY_RULE_SETUP
+-#line 394 "scan.l"
++#line 400 "scan.l"
+ return OPT_TABLES;
+ 	YY_BREAK
+-case 114:
++case 117:
+ YY_RULE_SETUP
+-#line 395 "scan.l"
++#line 401 "scan.l"
+ {
+                     tablesverify = option_sense;
+                     if(!tablesext && option_sense)
+                         tablesext = true;
+                     }
+ 	YY_BREAK
+-case 115:
++case 118:
+ YY_RULE_SETUP
+-#line 402 "scan.l"
++#line 408 "scan.l"
+ {
+ 			if(yyleng-1 < MAXLINE) 
+         		 { 
+@@ -2596,9 +2634,9 @@
+ 			return NAME;
+ 			}
+ 	YY_BREAK
+-case 116:
++case 119:
+ YY_RULE_SETUP
+-#line 416 "scan.l"
++#line 422 "scan.l"
+ {
+ 			format_synerr( _( "unrecognized %%option: %s" ),
+ 				yytext );
+@@ -2606,31 +2644,31 @@
+ 			}
+ 	YY_BREAK
+ 
+-case 117:
+-/* rule 117 can match eol */
++case 120:
++/* rule 120 can match eol */
+ YY_RULE_SETUP
+-#line 423 "scan.l"
++#line 429 "scan.l"
+ ++linenum; BEGIN(INITIAL);
+ 	YY_BREAK
+ 
+-case 118:
++case 121:
+ YY_RULE_SETUP
+-#line 427 "scan.l"
++#line 433 "scan.l"
+ ++bracelevel; yyless( 2 );	/* eat only %{ */
+ 	YY_BREAK
+-case 119:
++case 122:
+ YY_RULE_SETUP
+-#line 428 "scan.l"
++#line 434 "scan.l"
+ --bracelevel; yyless( 2 );	/* eat only %} */
+ 	YY_BREAK
+-case 120:
++case 123:
+ YY_RULE_SETUP
+-#line 430 "scan.l"
++#line 436 "scan.l"
+ ACTION_ECHO;	/* indented code in prolog */
+ 	YY_BREAK
+-case 121:
++case 124:
+ YY_RULE_SETUP
+-#line 432 "scan.l"
++#line 438 "scan.l"
+ {	/* non-indented code */
+ 			if ( bracelevel <= 0 )
+ 				{ /* not in %{ ... %} */
+@@ -2643,19 +2681,19 @@
+ 				ACTION_ECHO;
+ 			}
+ 	YY_BREAK
+-case 122:
++case 125:
+ YY_RULE_SETUP
+-#line 444 "scan.l"
++#line 450 "scan.l"
+ ACTION_ECHO;
+ 	YY_BREAK
+-case 123:
+-/* rule 123 can match eol */
++case 126:
++/* rule 126 can match eol */
+ YY_RULE_SETUP
+-#line 445 "scan.l"
++#line 451 "scan.l"
+ ++linenum; ACTION_ECHO;
+ 	YY_BREAK
+ case YY_STATE_EOF(SECT2PROLOG):
+-#line 447 "scan.l"
++#line 453 "scan.l"
+ {
+ 			mark_prolog();
+ 			sectnum = 0;
+@@ -2664,15 +2702,15 @@
+ 	YY_BREAK
+ 
+ 
+-case 124:
+-/* rule 124 can match eol */
++case 127:
++/* rule 127 can match eol */
+ YY_RULE_SETUP
+-#line 455 "scan.l"
++#line 461 "scan.l"
+ ++linenum; /* allow blank lines in section 2 */
+ 	YY_BREAK
+-case 125:
++case 128:
+ YY_RULE_SETUP
+-#line 457 "scan.l"
++#line 463 "scan.l"
+ {
+ 			indented_code = false;
+ 			doing_codeblock = true;
+@@ -2680,27 +2718,27 @@
+ 			BEGIN(PERCENT_BRACE_ACTION);
+ 			}
+ 	YY_BREAK
+-case 126:
++case 129:
+ YY_RULE_SETUP
+-#line 464 "scan.l"
++#line 470 "scan.l"
+ BEGIN(SC); return '<';
+ 	YY_BREAK
+-case 127:
++case 130:
+ YY_RULE_SETUP
+-#line 465 "scan.l"
++#line 471 "scan.l"
+ return '^';
+ 	YY_BREAK
+-case 128:
++case 131:
+ YY_RULE_SETUP
+-#line 466 "scan.l"
++#line 472 "scan.l"
+ BEGIN(QUOTE); return '"';
+ 	YY_BREAK
+-case 129:
++case 132:
+ *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
+ (yy_c_buf_p) = yy_cp = yy_bp + 1;
+ YY_DO_BEFORE_ACTION; /* set up yytext again */
+ YY_RULE_SETUP
+-#line 467 "scan.l"
++#line 473 "scan.l"
+ {
+ 			BEGIN(NUM);
+ 			if ( lex_compat || posix_compat )
+@@ -2709,18 +2747,18 @@
+ 				return BEGIN_REPEAT_FLEX;
+ 			}
+ 	YY_BREAK
+-case 130:
+-/* rule 130 can match eol */
++case 133:
++/* rule 133 can match eol */
+ *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
+ (yy_c_buf_p) = yy_cp = yy_bp + 1;
+ YY_DO_BEFORE_ACTION; /* set up yytext again */
+ YY_RULE_SETUP
+-#line 474 "scan.l"
++#line 480 "scan.l"
+ return '$';
+ 	YY_BREAK
+-case 131:
++case 134:
+ YY_RULE_SETUP
+-#line 476 "scan.l"
++#line 482 "scan.l"
+ {
+ 			bracelevel = 1;
+ 			BEGIN(PERCENT_BRACE_ACTION);
+@@ -2733,15 +2771,15 @@
+ 				}
+ 			}
+ 	YY_BREAK
+-case 132:
+-/* rule 132 can match eol */
++case 135:
++/* rule 135 can match eol */
+ YY_RULE_SETUP
+-#line 487 "scan.l"
++#line 493 "scan.l"
+ continued_action = true; ++linenum; return '\n';
+ 	YY_BREAK
+-case 133:
++case 136:
+ YY_RULE_SETUP
+-#line 489 "scan.l"
++#line 495 "scan.l"
+ {
+ 			yyless( yyleng - 2 );	/* put back '/', '*' */
+ 			bracelevel = 0;
+@@ -2749,14 +2787,14 @@
+ 			BEGIN(ACTION);
+ 			}
+ 	YY_BREAK
+-case 134:
++case 137:
+ YY_RULE_SETUP
+-#line 496 "scan.l"
++#line 502 "scan.l"
+ /* allow indented rules */
+ 	YY_BREAK
+-case 135:
++case 138:
+ YY_RULE_SETUP
+-#line 498 "scan.l"
++#line 504 "scan.l"
+ {
+ 			/* This rule is separate from the one below because
+ 			 * otherwise we get variable trailing context, so
+@@ -2774,10 +2812,10 @@
+ 				}
+ 			}
+ 	YY_BREAK
+-case 136:
+-/* rule 136 can match eol */
++case 139:
++/* rule 139 can match eol */
+ YY_RULE_SETUP
+-#line 515 "scan.l"
++#line 521 "scan.l"
+ {
+ 			bracelevel = 0;
+ 			continued_action = false;
+@@ -2792,16 +2830,16 @@
+ 				}
+ 			}
+ 	YY_BREAK
+-case 137:
+-#line 530 "scan.l"
+-case 138:
++case 140:
++#line 536 "scan.l"
++case 141:
+ YY_RULE_SETUP
+-#line 530 "scan.l"
++#line 536 "scan.l"
+ return EOF_OP;
+ 	YY_BREAK
+-case 139:
++case 142:
+ YY_RULE_SETUP
+-#line 532 "scan.l"
++#line 538 "scan.l"
+ {
+ 			sectnum = 3;
+ 			BEGIN(SECT3);
+@@ -2809,9 +2847,9 @@
+ 			yyterminate(); /* to stop the parser */
+ 			}
+ 	YY_BREAK
+-case 140:
++case 143:
+ YY_RULE_SETUP
+-#line 539 "scan.l"
++#line 545 "scan.l"
+ {
+ 			int cclval;
+ 
+@@ -2858,10 +2896,10 @@
+      * wrap the expanded regex in '(' ')' -- breaking trailing
+      * context.
+      */
+-case 141:
+-/* rule 141 can match eol */
++case 144:
++/* rule 144 can match eol */
+ YY_RULE_SETUP
+-#line 585 "scan.l"
++#line 591 "scan.l"
+ {
+ 			register Char *nmdefptr;
+             int end_is_ws, end_ch;
+@@ -2910,76 +2948,76 @@
+ 				}
+ 			}
+ 	YY_BREAK
+-case 142:
++case 145:
+ YY_RULE_SETUP
+-#line 633 "scan.l"
++#line 639 "scan.l"
+ return (unsigned char) yytext[0];
+ 	YY_BREAK
+-case 143:
++case 146:
+ YY_RULE_SETUP
+-#line 634 "scan.l"
++#line 640 "scan.l"
+ RETURNCHAR;
+ 	YY_BREAK
+ 
+ 
+-case 144:
+-/* rule 144 can match eol */
++case 147:
++/* rule 147 can match eol */
+ YY_RULE_SETUP
+-#line 639 "scan.l"
++#line 645 "scan.l"
+ ++linenum;	/* Allow blank lines & continuations */
+ 	YY_BREAK
+-case 145:
++case 148:
+ YY_RULE_SETUP
+-#line 640 "scan.l"
++#line 646 "scan.l"
+ return (unsigned char) yytext[0];
+ 	YY_BREAK
+-case 146:
++case 149:
+ YY_RULE_SETUP
+-#line 641 "scan.l"
++#line 647 "scan.l"
+ BEGIN(SECT2); return '>';
+ 	YY_BREAK
+-case 147:
++case 150:
+ *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
+ (yy_c_buf_p) = yy_cp = yy_bp + 1;
+ YY_DO_BEFORE_ACTION; /* set up yytext again */
+ YY_RULE_SETUP
+-#line 642 "scan.l"
++#line 648 "scan.l"
+ BEGIN(CARETISBOL); return '>';
+ 	YY_BREAK
+-case 148:
++case 151:
+ YY_RULE_SETUP
+-#line 643 "scan.l"
++#line 649 "scan.l"
+ RETURNNAME;
+ 	YY_BREAK
+-case 149:
++case 152:
+ YY_RULE_SETUP
+-#line 644 "scan.l"
++#line 650 "scan.l"
+ {
+ 			format_synerr( _( "bad <start condition>: %s" ),
+ 				yytext );
+ 			}
+ 	YY_BREAK
+ 
+-case 150:
++case 153:
+ YY_RULE_SETUP
+-#line 650 "scan.l"
++#line 656 "scan.l"
+ BEGIN(SECT2); return '^';
+ 	YY_BREAK
+ 
+-case 151:
++case 154:
+ YY_RULE_SETUP
+-#line 654 "scan.l"
++#line 660 "scan.l"
+ RETURNCHAR;
+ 	YY_BREAK
+-case 152:
++case 155:
+ YY_RULE_SETUP
+-#line 655 "scan.l"
++#line 661 "scan.l"
+ BEGIN(SECT2); return '"';
+ 	YY_BREAK
+-case 153:
+-/* rule 153 can match eol */
++case 156:
++/* rule 156 can match eol */
+ YY_RULE_SETUP
+-#line 657 "scan.l"
++#line 663 "scan.l"
+ {
+ 			synerr( _( "missing quote" ) );
+ 			BEGIN(SECT2);
+@@ -2989,51 +3027,51 @@
+ 	YY_BREAK
+ 
+ 
+-case 154:
++case 157:
+ *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
+ (yy_c_buf_p) = yy_cp = yy_bp + 1;
+ YY_DO_BEFORE_ACTION; /* set up yytext again */
+ YY_RULE_SETUP
+-#line 667 "scan.l"
++#line 673 "scan.l"
+ BEGIN(CCL); return '^';
+ 	YY_BREAK
+-case 155:
++case 158:
+ *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
+ (yy_c_buf_p) = yy_cp = yy_bp + 1;
+ YY_DO_BEFORE_ACTION; /* set up yytext again */
+ YY_RULE_SETUP
+-#line 668 "scan.l"
++#line 674 "scan.l"
+ return '^';
+ 	YY_BREAK
+-case 156:
++case 159:
+ YY_RULE_SETUP
+-#line 669 "scan.l"
++#line 675 "scan.l"
+ BEGIN(CCL); RETURNCHAR;
+ 	YY_BREAK
+ 
+ 
+-case 157:
++case 160:
+ *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
+ (yy_c_buf_p) = yy_cp = yy_bp + 1;
+ YY_DO_BEFORE_ACTION; /* set up yytext again */
+ YY_RULE_SETUP
+-#line 673 "scan.l"
++#line 679 "scan.l"
+ return '-';
+ 	YY_BREAK
+-case 158:
++case 161:
+ YY_RULE_SETUP
+-#line 674 "scan.l"
++#line 680 "scan.l"
+ RETURNCHAR;
+ 	YY_BREAK
+-case 159:
++case 162:
+ YY_RULE_SETUP
+-#line 675 "scan.l"
++#line 681 "scan.l"
+ BEGIN(SECT2); return ']';
+ 	YY_BREAK
+-case 160:
+-/* rule 160 can match eol */
++case 163:
++/* rule 163 can match eol */
+ YY_RULE_SETUP
+-#line 676 "scan.l"
++#line 682 "scan.l"
+ {
+ 			synerr( _( "bad character class" ) );
+ 			BEGIN(SECT2);
+@@ -3042,69 +3080,69 @@
+ 	YY_BREAK
+ 
+ 
+-case 161:
++case 164:
+ YY_RULE_SETUP
+-#line 684 "scan.l"
++#line 690 "scan.l"
+ BEGIN(CCL); return CCE_ALNUM;
+ 	YY_BREAK
+-case 162:
++case 165:
+ YY_RULE_SETUP
+-#line 685 "scan.l"
++#line 691 "scan.l"
+ BEGIN(CCL); return CCE_ALPHA;
+ 	YY_BREAK
+-case 163:
++case 166:
+ YY_RULE_SETUP
+-#line 686 "scan.l"
++#line 692 "scan.l"
+ BEGIN(CCL); return CCE_BLANK;
+ 	YY_BREAK
+-case 164:
++case 167:
+ YY_RULE_SETUP
+-#line 687 "scan.l"
++#line 693 "scan.l"
+ BEGIN(CCL); return CCE_CNTRL;
+ 	YY_BREAK
+-case 165:
++case 168:
+ YY_RULE_SETUP
+-#line 688 "scan.l"
++#line 694 "scan.l"
+ BEGIN(CCL); return CCE_DIGIT;
+ 	YY_BREAK
+-case 166:
++case 169:
+ YY_RULE_SETUP
+-#line 689 "scan.l"
++#line 695 "scan.l"
+ BEGIN(CCL); return CCE_GRAPH;
+ 	YY_BREAK
+-case 167:
++case 170:
+ YY_RULE_SETUP
+-#line 690 "scan.l"
++#line 696 "scan.l"
+ BEGIN(CCL); return CCE_LOWER;
+ 	YY_BREAK
+-case 168:
++case 171:
+ YY_RULE_SETUP
+-#line 691 "scan.l"
++#line 697 "scan.l"
+ BEGIN(CCL); return CCE_PRINT;
+ 	YY_BREAK
+-case 169:
++case 172:
+ YY_RULE_SETUP
+-#line 692 "scan.l"
++#line 698 "scan.l"
+ BEGIN(CCL); return CCE_PUNCT;
+ 	YY_BREAK
+-case 170:
++case 173:
+ YY_RULE_SETUP
+-#line 693 "scan.l"
++#line 699 "scan.l"
+ BEGIN(CCL); return CCE_SPACE;
+ 	YY_BREAK
+-case 171:
++case 174:
+ YY_RULE_SETUP
+-#line 694 "scan.l"
++#line 700 "scan.l"
+ BEGIN(CCL); return CCE_UPPER;
+ 	YY_BREAK
+-case 172:
++case 175:
+ YY_RULE_SETUP
+-#line 695 "scan.l"
++#line 701 "scan.l"
+ BEGIN(CCL); return CCE_XDIGIT;
+ 	YY_BREAK
+-case 173:
++case 176:
+ YY_RULE_SETUP
+-#line 696 "scan.l"
++#line 702 "scan.l"
+ {
+ 			format_synerr(
+ 				_( "bad character class expression: %s" ),
+@@ -3114,22 +3152,22 @@
+ 	YY_BREAK
+ 
+ 
+-case 174:
++case 177:
+ YY_RULE_SETUP
+-#line 705 "scan.l"
++#line 711 "scan.l"
+ {
+ 			yylval = myctoi( yytext );
+ 			return NUMBER;
+ 			}
+ 	YY_BREAK
+-case 175:
++case 178:
+ YY_RULE_SETUP
+-#line 710 "scan.l"
++#line 716 "scan.l"
+ return ',';
+ 	YY_BREAK
+-case 176:
++case 179:
+ YY_RULE_SETUP
+-#line 711 "scan.l"
++#line 717 "scan.l"
+ {
+ 			BEGIN(SECT2);
+ 			if ( lex_compat || posix_compat )
+@@ -3138,19 +3176,19 @@
+ 				return END_REPEAT_FLEX;
+ 			}
+ 	YY_BREAK
+-case 177:
++case 180:
+ YY_RULE_SETUP
+-#line 719 "scan.l"
++#line 725 "scan.l"
+ {
+ 			synerr( _( "bad character inside {}'s" ) );
+ 			BEGIN(SECT2);
+ 			return '}';
+ 			}
+ 	YY_BREAK
+-case 178:
+-/* rule 178 can match eol */
++case 181:
++/* rule 181 can match eol */
+ YY_RULE_SETUP
+-#line 725 "scan.l"
++#line 731 "scan.l"
+ {
+ 			synerr( _( "missing }" ) );
+ 			BEGIN(SECT2);
+@@ -3160,43 +3198,43 @@
+ 	YY_BREAK
+ 
+ 
+-case 179:
++case 182:
+ YY_RULE_SETUP
+-#line 735 "scan.l"
++#line 741 "scan.l"
+ bracelevel = 0;
+ 	YY_BREAK
+-case 180:
++case 183:
+ YY_RULE_SETUP
+-#line 737 "scan.l"
++#line 743 "scan.l"
+ ACTION_ECHO; yy_push_state( COMMENT );
+ 	YY_BREAK
+ 
+-case 181:
++case 184:
+ YY_RULE_SETUP
+-#line 740 "scan.l"
++#line 746 "scan.l"
+ {
+ 			ACTION_ECHO;
+ 			CHECK_REJECT(yytext);
+ 			}
+ 	YY_BREAK
+-case 182:
++case 185:
+ YY_RULE_SETUP
+-#line 744 "scan.l"
++#line 750 "scan.l"
+ {
+ 			ACTION_ECHO;
+ 			CHECK_YYMORE(yytext);
+ 			}
+ 	YY_BREAK
+ 
+-case 183:
++case 186:
+ YY_RULE_SETUP
+-#line 750 "scan.l"
++#line 756 "scan.l"
+ ACTION_ECHO;
+ 	YY_BREAK
+-case 184:
+-/* rule 184 can match eol */
++case 187:
++/* rule 187 can match eol */
+ YY_RULE_SETUP
+-#line 751 "scan.l"
++#line 757 "scan.l"
+ {
+ 			++linenum;
+ 			ACTION_ECHO;
+@@ -3214,40 +3252,40 @@
+ 
+ /* Reject and YYmore() are checked for above, in PERCENT_BRACE_ACTION */
+ 
+-case 185:
++case 188:
+ YY_RULE_SETUP
+-#line 769 "scan.l"
++#line 775 "scan.l"
+ ACTION_ECHO; ++bracelevel;
+ 	YY_BREAK
+-case 186:
++case 189:
+ YY_RULE_SETUP
+-#line 770 "scan.l"
++#line 776 "scan.l"
+ ACTION_ECHO; --bracelevel;
+ 	YY_BREAK
+-case 187:
++case 190:
+ YY_RULE_SETUP
+-#line 771 "scan.l"
++#line 777 "scan.l"
+ ACTION_ECHO;
+ 	YY_BREAK
+-case 188:
++case 191:
+ YY_RULE_SETUP
+-#line 772 "scan.l"
++#line 778 "scan.l"
+ ACTION_ECHO;
+ 	YY_BREAK
+-case 189:
++case 192:
+ YY_RULE_SETUP
+-#line 773 "scan.l"
++#line 779 "scan.l"
+ ACTION_ECHO; /* character constant */
+ 	YY_BREAK
+-case 190:
++case 193:
+ YY_RULE_SETUP
+-#line 774 "scan.l"
++#line 780 "scan.l"
+ ACTION_ECHO; BEGIN(ACTION_STRING);
+ 	YY_BREAK
+-case 191:
+-/* rule 191 can match eol */
++case 194:
++/* rule 194 can match eol */
+ YY_RULE_SETUP
+-#line 775 "scan.l"
++#line 781 "scan.l"
+ {
+ 			++linenum;
+ 			ACTION_ECHO;
+@@ -3261,52 +3299,52 @@
+ 				}
+ 			}
+ 	YY_BREAK
+-case 192:
++case 195:
+ YY_RULE_SETUP
+-#line 787 "scan.l"
++#line 793 "scan.l"
+ ACTION_ECHO;
+ 	YY_BREAK
+ 
+ 
+-case 193:
++case 196:
+ YY_RULE_SETUP
+-#line 791 "scan.l"
++#line 797 "scan.l"
+ ACTION_ECHO;
+ 	YY_BREAK
+-case 194:
++case 197:
+ YY_RULE_SETUP
+-#line 792 "scan.l"
++#line 798 "scan.l"
+ ACTION_ECHO;
+ 	YY_BREAK
+-case 195:
+-/* rule 195 can match eol */
++case 198:
++/* rule 198 can match eol */
+ YY_RULE_SETUP
+-#line 793 "scan.l"
++#line 799 "scan.l"
+ ++linenum; ACTION_ECHO; BEGIN(ACTION);
+ 	YY_BREAK
+-case 196:
++case 199:
+ YY_RULE_SETUP
+-#line 794 "scan.l"
++#line 800 "scan.l"
+ ACTION_ECHO; BEGIN(ACTION);
+ 	YY_BREAK
+-case 197:
++case 200:
+ YY_RULE_SETUP
+-#line 795 "scan.l"
++#line 801 "scan.l"
+ ACTION_ECHO;
+ 	YY_BREAK
+ 
+ case YY_STATE_EOF(COMMENT):
+ case YY_STATE_EOF(ACTION):
+ case YY_STATE_EOF(ACTION_STRING):
+-#line 798 "scan.l"
++#line 804 "scan.l"
+ {
+ 			synerr( _( "EOF encountered inside an action" ) );
+ 			yyterminate();
+ 			}
+ 	YY_BREAK
+-case 198:
++case 201:
+ YY_RULE_SETUP
+-#line 804 "scan.l"
++#line 810 "scan.l"
+ {
+ 			yylval = myesc( (Char *) yytext );
+ 
+@@ -3317,29 +3355,29 @@
+ 			}
+ 	YY_BREAK
+ 
+-case 199:
+-/* rule 199 can match eol */
++case 202:
++/* rule 202 can match eol */
+ YY_RULE_SETUP
+-#line 815 "scan.l"
++#line 821 "scan.l"
+ ECHO;
+ 	YY_BREAK
+ case YY_STATE_EOF(SECT3):
+-#line 816 "scan.l"
++#line 822 "scan.l"
+ sectnum = 0; yyterminate();
+ 	YY_BREAK
+ 
+-case 200:
+-/* rule 200 can match eol */
++case 203:
++/* rule 203 can match eol */
+ YY_RULE_SETUP
+-#line 819 "scan.l"
++#line 825 "scan.l"
+ format_synerr( _( "bad character: %s" ), yytext );
+ 	YY_BREAK
+-case 201:
++case 204:
+ YY_RULE_SETUP
+-#line 821 "scan.l"
++#line 827 "scan.l"
+ YY_FATAL_ERROR( "flex scanner jammed" );
+ 	YY_BREAK
+-#line 3343 "scan.c"
++#line 3381 "scan.c"
+ case YY_STATE_EOF(INITIAL):
+ case YY_STATE_EOF(SECT2):
+ case YY_STATE_EOF(CODEBLOCK):
+@@ -3637,7 +3675,7 @@
+ 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+ 			{
+ 			yy_current_state = (int) yy_def[yy_current_state];
+-			if ( yy_current_state >= 973 )
++			if ( yy_current_state >= 977 )
+ 				yy_c = yy_meta[(unsigned int) yy_c];
+ 			}
+ 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+@@ -3665,11 +3703,11 @@
+ 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+ 		{
+ 		yy_current_state = (int) yy_def[yy_current_state];
+-		if ( yy_current_state >= 973 )
++		if ( yy_current_state >= 977 )
+ 			yy_c = yy_meta[(unsigned int) yy_c];
+ 		}
+ 	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+-	yy_is_jam = (yy_current_state == 972);
++	yy_is_jam = (yy_current_state == 976);
+ 
+ 	return yy_is_jam ? 0 : yy_current_state;
+ }
+@@ -4093,10 +4131,10 @@
+  * @note If you want to scan bytes that may contain NUL values, then use
+  *       yy_scan_bytes() instead.
+  */
+-YY_BUFFER_STATE yy_scan_string (yyconst char * str )
++YY_BUFFER_STATE yy_scan_string (yyconst char * yy_str )
+ {
+     
+-	return yy_scan_bytes(str,strlen(str) );
++	return yy_scan_bytes(yy_str,strlen(yy_str) );
+ }
+ 
+ /** Setup the input buffer state to scan the given bytes. The next call to yylex() will
+@@ -4358,7 +4396,7 @@
+ #undef YY_DECL_IS_OURS
+ #undef YY_DECL
+ #endif
+-#line 821 "scan.l"
++#line 827 "scan.l"
+ 
+ 
+ 
+diff -Naur --exclude-from=ignore-list flex-2.5.31.orig/skel.c flex-2.5.31/skel.c
+--- flex-2.5.31.orig/skel.c	2003-04-01 16:33:08.000000000 +0000
++++ flex-2.5.31/skel.c	2005-06-12 18:45:28.060442856 +0000
+@@ -404,16 +404,16 @@
+   "%#        yyscan_t yyscanner;",
+   "%#",
+   "%# Generate traditional function defs",
+-  "    m4_define( [[YYFARGS0]], [[(M4_YY_DEF_ONLY_ARG)",
++  "    m4_define( [[YYFARGS0]], [[(M4_YY_DEF_ONLY_ARG) [[\\]]",
+   "        M4_YY_DECL_LAST_ARG]])",
+-  "    m4_define( [[YYFARGS1]], [[($2 M4_YY_DEF_LAST_ARG)",
++  "    m4_define( [[YYFARGS1]], [[($2 M4_YY_DEF_LAST_ARG) [[\\]]",
+   "        $1 $2;",
+   "        M4_YY_DECL_LAST_ARG]])",
+-  "    m4_define( [[YYFARGS2]], [[($2,$4 M4_YY_DEF_LAST_ARG)",
++  "    m4_define( [[YYFARGS2]], [[($2,$4 M4_YY_DEF_LAST_ARG) [[\\]]",
+   "        $1 $2;",
+   "        $3 $4;",
+   "        M4_YY_DECL_LAST_ARG]])",
+-  "    m4_define( [[YYFARGS3]], [[($2,$4,$6 M4_YY_DEF_LAST_ARG)",
++  "    m4_define( [[YYFARGS3]], [[($2,$4,$6 M4_YY_DEF_LAST_ARG) [[\\]]",
+   "        $1 $2;",
+   "        $3 $4;",
+   "        $5 $6;",
+@@ -783,6 +783,7 @@
+   "",
+   "m4_ifdef( [[M4_YY_NO_UNISTD_H]],,",
+   "[[",
++  "#ifndef YY_NO_UNISTD_H",
+   "/* Special case for \"unistd.h\", since it is non-ANSI. We include it way",
+   " * down here because we want the user's section 1 to have been scanned first.",
+   " * The user has a chance to override it with an option.",
+@@ -793,6 +794,7 @@
+   "%if-c++-only",
+   "#include <unistd.h>",
+   "%endif",
++  "#endif",
+   "]])",
+   "",
+   "#ifndef YY_EXTRA_TYPE",
+@@ -2454,11 +2456,11 @@
+   " * @note If you want to scan bytes that may contain NUL values, then use",
+   " *       yy_scan_bytes() instead.",
+   " */",
+-  "YY_BUFFER_STATE yy_scan_string YYFARGS1( yyconst char *,str)",
++  "YY_BUFFER_STATE yy_scan_string YYFARGS1( yyconst char *,yy_str)",
+   "{",
+   "    m4_dnl M4_YY_DECL_GUTS_VAR();",
+   "",
+-  "	return yy_scan_bytes( str, strlen(str) M4_YY_CALL_LAST_ARG);",
++  "	return yy_scan_bytes( yy_str, strlen(yy_str) M4_YY_CALL_LAST_ARG);",
+   "}",
+   "%endif",
+   "]])",

Deleted: trunk/flex/flex-2.5.31-debian_fixes-4.patch
===================================================================
--- trunk/flex/flex-2.5.31-debian_fixes-4.patch	2005-06-20 16:25:51 UTC (rev 982)
+++ trunk/flex/flex-2.5.31-debian_fixes-4.patch	2005-06-20 16:40:45 UTC (rev 983)
@@ -1,26974 +0,0 @@
-Submitted By: Jim Gifford (patches at jg555 dot com)
-Date: 2004-01-05
-Initial Package Version: 2.5.31
-Origin: Debian
-Upstream Status: Unknown
-Description: Various fixes for Flex 2.5.31
- 
-diff -Naur flex-2.5.31.orig/Makefile.in flex-2.5.31/Makefile.in
---- flex-2.5.31.orig/Makefile.in	2003-04-01 16:32:34.000000000 +0000
-+++ flex-2.5.31/Makefile.in	2005-01-08 07:43:01.319980448 +0000
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.7 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # @configure_input@
- 
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -49,6 +49,10 @@
- # For MS-DOS, add "-DMS_DOS" to DEFS.  See the directory MISC/MSDOS for
- # additional info.
- 
-+
-+
-+SOURCES = $(libfl_a_SOURCES) $(flex_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -56,7 +60,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = .
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -71,6 +74,90 @@
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
- host_triplet = @host@
-+bin_PROGRAMS = flex$(EXEEXT)
-+DIST_COMMON = README $(am__configure_deps) $(include_HEADERS) \
-+	$(noinst_HEADERS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-+	$(srcdir)/conf.in $(srcdir)/flex.spec.in \
-+	$(top_srcdir)/configure ABOUT-NLS AUTHORS COPYING ChangeLog \
-+	INSTALL NEWS README-alpha THANKS TODO config.guess \
-+	config.rpath config.sub depcomp install-sh missing \
-+	mkinstalldirs parse.c parse.h scan.c
-+subdir = .
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
-+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-+ configure.lineno configure.status.lineno
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_HEADER = config.h
-+CONFIG_CLEAN_FILES = flex.spec
-+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includedir)"
-+libLIBRARIES_INSTALL = $(INSTALL_DATA)
-+LIBRARIES = $(lib_LIBRARIES)
-+AR = ar
-+ARFLAGS = cru
-+libfl_a_AR = $(AR) $(ARFLAGS)
-+libfl_a_LIBADD =
-+am_libfl_a_OBJECTS = libmain.$(OBJEXT) libyywrap.$(OBJEXT)
-+libfl_a_OBJECTS = $(am_libfl_a_OBJECTS)
-+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-+PROGRAMS = $(bin_PROGRAMS)
-+am_flex_OBJECTS = ccl.$(OBJEXT) dfa.$(OBJEXT) ecs.$(OBJEXT) \
-+	gen.$(OBJEXT) main.$(OBJEXT) misc.$(OBJEXT) nfa.$(OBJEXT) \
-+	parse.$(OBJEXT) scan.$(OBJEXT) skel.$(OBJEXT) sym.$(OBJEXT) \
-+	tblcmp.$(OBJEXT) yylex.$(OBJEXT) options.$(OBJEXT) \
-+	scanopt.$(OBJEXT) buf.$(OBJEXT) tables.$(OBJEXT) \
-+	tables_shared.$(OBJEXT) filter.$(OBJEXT) regex.$(OBJEXT)
-+flex_OBJECTS = $(am_flex_OBJECTS)
-+flex_LDADD = $(LDADD)
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
-+depcomp = $(SHELL) $(top_srcdir)/depcomp
-+am__depfiles_maybe = depfiles
-+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/buf.Po ./$(DEPDIR)/ccl.Po \
-+ at AMDEP_TRUE@	./$(DEPDIR)/dfa.Po ./$(DEPDIR)/ecs.Po \
-+ at AMDEP_TRUE@	./$(DEPDIR)/filter.Po ./$(DEPDIR)/gen.Po \
-+ at AMDEP_TRUE@	./$(DEPDIR)/libmain.Po ./$(DEPDIR)/libyywrap.Po \
-+ at AMDEP_TRUE@	./$(DEPDIR)/main.Po ./$(DEPDIR)/misc.Po \
-+ at AMDEP_TRUE@	./$(DEPDIR)/nfa.Po ./$(DEPDIR)/options.Po \
-+ at AMDEP_TRUE@	./$(DEPDIR)/parse.Po ./$(DEPDIR)/regex.Po \
-+ at AMDEP_TRUE@	./$(DEPDIR)/scan.Po ./$(DEPDIR)/scanopt.Po \
-+ at AMDEP_TRUE@	./$(DEPDIR)/skel.Po ./$(DEPDIR)/sym.Po \
-+ at AMDEP_TRUE@	./$(DEPDIR)/tables.Po ./$(DEPDIR)/tables_shared.Po \
-+ at AMDEP_TRUE@	./$(DEPDIR)/tblcmp.Po ./$(DEPDIR)/yylex.Po
-+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS)
-+YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS)
-+SOURCES = $(libfl_a_SOURCES) $(flex_SOURCES)
-+DIST_SOURCES = $(libfl_a_SOURCES) $(flex_SOURCES)
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+	html-recursive info-recursive install-data-recursive \
-+	install-exec-recursive install-info-recursive \
-+	install-recursive installcheck-recursive installdirs-recursive \
-+	pdf-recursive ps-recursive uninstall-info-recursive \
-+	uninstall-recursive
-+includeHEADERS_INSTALL = $(INSTALL_HEADER)
-+HEADERS = $(include_HEADERS) $(noinst_HEADERS)
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+distdir = $(PACKAGE)-$(VERSION)
-+top_distdir = $(distdir)
-+am__remove_distdir = \
-+  { test ! -d $(distdir) \
-+    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-+         && rm -fr $(distdir); }; }
-+DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
-+GZIP_ENV = --best
-+distuninstallcheck_listfiles = find . -type f -print
-+distcleancheck_listfiles = find . -type f -print
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -110,12 +197,16 @@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
- LIBICONV = @LIBICONV@
- LIBINTL = @LIBINTL@
-+LIBOBJS = @LIBOBJS@
- LIBS = @LIBINTL@ @LIBS@
- LN_S = @LN_S@
- LTLIBICONV = @LTLIBICONV@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- M4 = @M4@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
-@@ -146,6 +237,7 @@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
- am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
- bindir = @bindir@
- build = @build@
-@@ -167,6 +259,7 @@
- libexecdir = @libexecdir@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-@@ -174,22 +267,17 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--
- AM_YFLAGS = -d
- ACLOCAL_AMFLAGS = -I m4
- m4 = @M4@
- indent = @INDENT@
--
- AUTOMAKE_OPTIONS = \
- 	gnits \
- 	check-news \
- 	dist-bzip2 \
- 	1.7
- 
--
--bin_PROGRAMS = flex
- lib_LIBRARIES = libfl.a
--
- flex_SOURCES = \
- 	ccl.c \
- 	dfa.c \
-@@ -212,12 +300,10 @@
- 	filter.c \
- 	regex.c
- 
--
- libfl_a_SOURCES = \
- 	libmain.c \
- 	libyywrap.c
- 
--
- noinst_HEADERS = \
- 	flexdef.h \
- 	flexint.h \
-@@ -227,11 +313,9 @@
- 	tables.h \
- 	tables_shared.h
- 
--
- include_HEADERS = \
- 	FlexLexer.h
- 
--
- MAINTAINERCLEANFILES = \
- 	ABOUT-NLS \
- 	config.rpath \
-@@ -252,7 +336,6 @@
- 	mdate-sh \
- 	missing
- 
--
- EXTRA_DIST = \
- 	flex.spec.in \
- 	flex.spec \
-@@ -274,11 +357,9 @@
- 	config.rpath \
- 	gettext.h
- 
--
- BUILT_SOURCES = \
- 	skel.c
- 
--
- SUBDIRS = \
- 	. \
- 	doc \
-@@ -288,7 +369,6 @@
- 	tools \
- 	tests
- 
--
- localedir = $(datadir)/locale
- AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -I at includedir@ -I$(top_srcdir)/intl
- 
-@@ -326,89 +406,43 @@
- 	tables_shared.h \
- 	tblcmp.c
- 
--subdir = .
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--CONFIG_HEADER = config.h
--CONFIG_CLEAN_FILES = flex.spec
--LIBRARIES = $(lib_LIBRARIES)
--
--libfl_a_AR = $(AR) cru
--libfl_a_LIBADD =
--am_libfl_a_OBJECTS = libmain.$(OBJEXT) libyywrap.$(OBJEXT)
--libfl_a_OBJECTS = $(am_libfl_a_OBJECTS)
--bin_PROGRAMS = flex$(EXEEXT)
--PROGRAMS = $(bin_PROGRAMS)
--
--am_flex_OBJECTS = ccl.$(OBJEXT) dfa.$(OBJEXT) ecs.$(OBJEXT) \
--	gen.$(OBJEXT) main.$(OBJEXT) misc.$(OBJEXT) nfa.$(OBJEXT) \
--	parse.$(OBJEXT) scan.$(OBJEXT) skel.$(OBJEXT) sym.$(OBJEXT) \
--	tblcmp.$(OBJEXT) yylex.$(OBJEXT) options.$(OBJEXT) \
--	scanopt.$(OBJEXT) buf.$(OBJEXT) tables.$(OBJEXT) \
--	tables_shared.$(OBJEXT) filter.$(OBJEXT) regex.$(OBJEXT)
--flex_OBJECTS = $(am_flex_OBJECTS)
--flex_LDADD = $(LDADD)
--flex_DEPENDENCIES =
--flex_LDFLAGS =
--
--DEFAULT_INCLUDES =  -I. -I$(srcdir) -I.
--depcomp = $(SHELL) $(top_srcdir)/depcomp
--am__depfiles_maybe = depfiles
-- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/buf.Po ./$(DEPDIR)/ccl.Po \
-- at AMDEP_TRUE@	./$(DEPDIR)/dfa.Po ./$(DEPDIR)/ecs.Po \
-- at AMDEP_TRUE@	./$(DEPDIR)/filter.Po ./$(DEPDIR)/gen.Po \
-- at AMDEP_TRUE@	./$(DEPDIR)/libmain.Po ./$(DEPDIR)/libyywrap.Po \
-- at AMDEP_TRUE@	./$(DEPDIR)/main.Po ./$(DEPDIR)/misc.Po \
-- at AMDEP_TRUE@	./$(DEPDIR)/nfa.Po ./$(DEPDIR)/options.Po \
-- at AMDEP_TRUE@	./$(DEPDIR)/parse.Po ./$(DEPDIR)/regex.Po \
-- at AMDEP_TRUE@	./$(DEPDIR)/scan.Po ./$(DEPDIR)/scanopt.Po \
-- at AMDEP_TRUE@	./$(DEPDIR)/skel.Po ./$(DEPDIR)/sym.Po \
-- at AMDEP_TRUE@	./$(DEPDIR)/tables.Po ./$(DEPDIR)/tables_shared.Po \
-- at AMDEP_TRUE@	./$(DEPDIR)/tblcmp.Po ./$(DEPDIR)/yylex.Po
--COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
--	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--CCLD = $(CC)
--LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
--LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS)
--YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS)
--DIST_SOURCES = $(libfl_a_SOURCES) $(flex_SOURCES)
--HEADERS = $(include_HEADERS) $(noinst_HEADERS)
--
--
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--	ps-recursive install-info-recursive uninstall-info-recursive \
--	all-recursive install-data-recursive install-exec-recursive \
--	installdirs-recursive install-recursive uninstall-recursive \
--	check-recursive installcheck-recursive
--DIST_COMMON = README $(include_HEADERS) $(noinst_HEADERS) ABOUT-NLS \
--	AUTHORS COPYING ChangeLog INSTALL Makefile.am Makefile.in NEWS \
--	README-alpha THANKS TODO aclocal.m4 conf.in config.guess \
--	config.rpath config.sub configure configure.in depcomp \
--	flex.spec.in install-sh missing mkinstalldirs parse.c parse.h \
--	scan.c
--DIST_SUBDIRS = $(SUBDIRS)
--SOURCES = $(libfl_a_SOURCES) $(flex_SOURCES)
--
- all: $(BUILT_SOURCES) config.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
- 
- .SUFFIXES:
- .SUFFIXES: .c .l .o .obj .y
--
--am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-- configure.lineno
--$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+am--refresh:
-+	@:
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnits '; \
-+	      cd $(srcdir) && $(AUTOMAKE) --gnits  \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits  Makefile'; \
- 	cd $(top_srcdir) && \
- 	  $(AUTOMAKE) --gnits  Makefile
--Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    echo ' $(SHELL) ./config.status'; \
-+	    $(SHELL) ./config.status;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-+	esac;
- 
--$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	$(SHELL) ./config.status --recheck
--$(srcdir)/configure:  $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
--	cd $(srcdir) && $(AUTOCONF)
- 
--$(ACLOCAL_M4):  configure.in m4/codeset.m4 m4/gettext.m4 m4/glibc21.m4 m4/iconv.m4 m4/intdiv0.m4 m4/inttypes-pri.m4 m4/inttypes.m4 m4/inttypes_h.m4 m4/isc-posix.m4 m4/lcmessage.m4 m4/lib-ld.m4 m4/lib-link.m4 m4/lib-prefix.m4 m4/progtest.m4 m4/stdint_h.m4 m4/uintmax_t.m4 m4/ulonglong.m4
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(srcdir) && $(AUTOCONF)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
- 
- config.h: stamp-h1
-@@ -420,34 +454,31 @@
- stamp-h1: $(srcdir)/conf.in $(top_builddir)/config.status
- 	@rm -f stamp-h1
- 	cd $(top_builddir) && $(SHELL) ./config.status config.h
--
--$(srcdir)/conf.in:  $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-+$(srcdir)/conf.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
- 	cd $(top_srcdir) && $(AUTOHEADER)
--	touch $(srcdir)/conf.in
-+	rm -f stamp-h1
-+	touch $@
- 
- distclean-hdr:
- 	-rm -f config.h stamp-h1
--flex.spec: $(top_builddir)/config.status flex.spec.in
-+flex.spec: $(top_builddir)/config.status $(srcdir)/flex.spec.in
- 	cd $(top_builddir) && $(SHELL) ./config.status $@
--
--AR = ar
--libLIBRARIES_INSTALL = $(INSTALL_DATA)
- install-libLIBRARIES: $(lib_LIBRARIES)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(libdir)
-+	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- 	@list='$(lib_LIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f="`echo $$p | sed -e 's|^.*/||'`"; \
--	    echo " $(libLIBRARIES_INSTALL) $$p $(DESTDIR)$(libdir)/$$f"; \
--	    $(libLIBRARIES_INSTALL) $$p $(DESTDIR)$(libdir)/$$f; \
-+	    echo " $(libLIBRARIES_INSTALL) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-+	    $(libLIBRARIES_INSTALL) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- 	  else :; fi; \
- 	done
- 	@$(POST_INSTALL)
- 	@list='$(lib_LIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    p="`echo $$p | sed -e 's|^.*/||'`"; \
--	    echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
--	    $(RANLIB) $(DESTDIR)$(libdir)/$$p; \
-+	    echo " $(RANLIB) '$(DESTDIR)$(libdir)/$$p'"; \
-+	    $(RANLIB) "$(DESTDIR)$(libdir)/$$p"; \
- 	  else :; fi; \
- 	done
- 
-@@ -455,8 +486,8 @@
- 	@$(NORMAL_UNINSTALL)
- 	@list='$(lib_LIBRARIES)'; for p in $$list; do \
- 	  p="`echo $$p | sed -e 's|^.*/||'`"; \
--	  echo " rm -f $(DESTDIR)$(libdir)/$$p"; \
--	  rm -f $(DESTDIR)$(libdir)/$$p; \
-+	  echo " rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-+	  rm -f "$(DESTDIR)$(libdir)/$$p"; \
- 	done
- 
- clean-libLIBRARIES:
-@@ -465,17 +496,16 @@
- 	-rm -f libfl.a
- 	$(libfl_a_AR) libfl.a $(libfl_a_OBJECTS) $(libfl_a_LIBADD)
- 	$(RANLIB) libfl.a
--binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
- install-binPROGRAMS: $(bin_PROGRAMS)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(bindir)
-+	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
- 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
- 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
- 	  if test -f $$p \
- 	  ; then \
- 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
--	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
--	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
-+	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-+	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
- 	  else :; fi; \
- 	done
- 
-@@ -483,8 +513,8 @@
- 	@$(NORMAL_UNINSTALL)
- 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
- 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
--	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
--	  rm -f $(DESTDIR)$(bindir)/$$f; \
-+	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
- 	done
- 
- clean-binPROGRAMS:
-@@ -498,9 +528,9 @@
- 	  f=`echo "$$p" | \
- 	     sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
- 	  for opt in --help --version; do \
--	    if $(DESTDIR)$(bindir)/$$f $$opt > c$${pid}_.out 2> c$${pid}_.err \
--	         && test -n "`cat c$${pid}_.out`" \
--	         && test -z "`cat c$${pid}_.err`"; then :; \
-+	    if "$(DESTDIR)$(bindir)/$$f" $$opt > c$${pid}_.out 2> c$${pid}_.err \
-+		 && test -n "`cat c$${pid}_.out`" \
-+		 && test -z "`cat c$${pid}_.err`"; then :; \
- 	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
- 	  done; \
- 	done; rm -f c$${pid}_.???; exit $$bad
-@@ -514,7 +544,7 @@
- 	$(LINK) $(flex_LDFLAGS) $(flex_OBJECTS) $(flex_LDADD) $(LIBS)
- 
- mostlyclean-compile:
--	-rm -f *.$(OBJEXT) core *.core
-+	-rm -f *.$(OBJEXT)
- 
- distclean-compile:
- 	-rm -f *.tab.c
-@@ -542,40 +572,29 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tblcmp.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/yylex.Po at am__quote@
- 
--distclean-depend:
--	-rm -rf ./$(DEPDIR)
--
- .c.o:
-- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCC_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCC_TRUE@	fi
-+ at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
-+ at am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
-- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'`; \
-- at am__fastdepCC_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCC_TRUE@	fi
-+ at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'`
-+ at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .l.c:
--	$(LEXCOMPILE) `test -f $< || echo '$(srcdir)/'`$<
-+	$(LEXCOMPILE) $<
- 	sed '/^#/ s|$(LEX_OUTPUT_ROOT)\.c|$@|' $(LEX_OUTPUT_ROOT).c >$@
- 	rm -f $(LEX_OUTPUT_ROOT).c
- 
- .y.c:
--	$(YACCCOMPILE) `test -f '$<' || echo '$(srcdir)/'`$<
--	sed '/^#/ s|y\.tab\.c|$@|' y.tab.c >$@
--	rm -f y.tab.c
-+	$(YACCCOMPILE) $<
- 	if test -f y.tab.h; then \
- 	  to=`echo "$*_H" | sed \
-                 -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \
-@@ -591,24 +610,25 @@
- 	if test -f y.output; then \
- 	  mv y.output $*.output; \
- 	fi
-+	sed '/^#/ s|y\.tab\.c|$@|' y.tab.c >$@t && mv $@t $@
-+	rm -f y.tab.c
- uninstall-info-am:
--includeHEADERS_INSTALL = $(INSTALL_HEADER)
- install-includeHEADERS: $(include_HEADERS)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(includedir)
-+	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
- 	@list='$(include_HEADERS)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
--	  echo " $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \
--	  $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \
-+	  echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
-+	  $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
- 	done
- 
- uninstall-includeHEADERS:
- 	@$(NORMAL_UNINSTALL)
- 	@list='$(include_HEADERS)'; for p in $$list; do \
- 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
--	  echo " rm -f $(DESTDIR)$(includedir)/$$f"; \
--	  rm -f $(DESTDIR)$(includedir)/$$f; \
-+	  echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(includedir)/$$f"; \
- 	done
- 
- # This directory's subdirectories are mostly independent; you can cd
-@@ -670,12 +690,6 @@
- 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- 	done
- 
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
-@@ -689,9 +703,17 @@
- 		$(TAGS_FILES) $(LISP)
- 	tags=; \
- 	here=`pwd`; \
-+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-+	  include_option=--etags-include; \
-+	  empty_fix=.; \
-+	else \
-+	  include_option=--include; \
-+	  empty_fix=; \
-+	fi; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
--	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-+	    test ! -f $$subdir/TAGS || \
-+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- 	  fi; \
- 	done; \
- 	list='$(SOURCES) $(HEADERS) conf.in $(LISP) $(TAGS_FILES)'; \
-@@ -700,10 +722,11 @@
- 	  done | \
- 	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$tags$$unique" \
--	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
--	     $$tags $$unique
--
-+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	    $$tags $$unique; \
-+	fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) conf.in $(TAGS_DEPENDENCIES) \
- 		$(TAGS_FILES) $(LISP)
-@@ -726,19 +749,6 @@
- 
- distclean-tags:
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--
--top_distdir = .
--distdir = $(PACKAGE)-$(VERSION)
--
--am__remove_distdir = \
--  { test ! -d $(distdir) \
--    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
--         && rm -fr $(distdir); }; }
--
--GZIP_ENV = --best
--distuninstallcheck_listfiles = find . -type f -print
--distcleancheck_listfiles = find . -type f -print
- 
- distdir: $(DISTFILES)
- 	@case `sed 15q $(srcdir)/NEWS` in \
-@@ -749,17 +759,19 @@
- 	esac
- 	$(am__remove_distdir)
- 	mkdir $(distdir)
--	$(mkinstalldirs) $(distdir)/. $(distdir)/po
-+	$(mkdir_p) $(distdir)/. $(distdir)/m4 $(distdir)/po
- 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- 	list='$(DISTFILES)'; for file in $$list; do \
- 	  case $$file in \
- 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- 	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- 	    dir="/$$dir"; \
--	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
- 	  else \
- 	    dir=''; \
- 	  fi; \
-@@ -776,13 +788,13 @@
- 	done
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
--	    test -d $(distdir)/$$subdir \
--	    || mkdir $(distdir)/$$subdir \
-+	    test -d "$(distdir)/$$subdir" \
-+	    || mkdir "$(distdir)/$$subdir" \
- 	    || exit 1; \
- 	    (cd $$subdir && \
- 	      $(MAKE) $(AM_MAKEFLAGS) \
--	        top_distdir="$(top_distdir)" \
--	        distdir=../$(distdir)/$$subdir \
-+	        top_distdir="../$(top_distdir)" \
-+	        distdir="../$(distdir)/$$subdir" \
- 	        distdir) \
- 	      || exit 1; \
- 	  fi; \
-@@ -795,11 +807,23 @@
- dist-gzip: distdir
- 	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- 	$(am__remove_distdir)
--
- dist-bzip2: distdir
- 	$(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
- 	$(am__remove_distdir)
- 
-+dist-tarZ: distdir
-+	$(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z
-+	$(am__remove_distdir)
-+
-+dist-shar: distdir
-+	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-+	$(am__remove_distdir)
-+
-+dist-zip: distdir
-+	-rm -f $(distdir).zip
-+	zip -rq $(distdir).zip $(distdir)
-+	$(am__remove_distdir)
-+
- dist dist-all: distdir
- 	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- 	$(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
-@@ -809,18 +833,26 @@
- # it guarantees that the distribution is self-contained by making another
- # tarfile.
- distcheck: dist
--	$(am__remove_distdir)
--	GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
-+	case '$(DIST_ARCHIVES)' in \
-+	*.tar.gz*) \
-+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ;;\
-+	*.tar.bz2*) \
-+	  bunzip2 -c $(distdir).tar.bz2 | $(AMTAR) xf - ;;\
-+	*.tar.Z*) \
-+	  uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\
-+	*.shar.gz*) \
-+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
-+	*.zip*) \
-+	  unzip $(distdir).zip ;;\
-+	esac
- 	chmod -R a-w $(distdir); chmod a+w $(distdir)
--	mkdir $(distdir)/=build
--	mkdir $(distdir)/=inst
-+	mkdir $(distdir)/_build
-+	mkdir $(distdir)/_inst
- 	chmod a-w $(distdir)
--	dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \
-+	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
- 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
--	  && $(mkinstalldirs) $$dc_destdir \
--	  && cd $(distdir)/=build \
-+	  && cd $(distdir)/_build \
- 	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
--	    --with-included-gettext \
- 	    $(DISTCHECK_CONFIGURE_FLAGS) \
- 	  && $(MAKE) $(AM_MAKEFLAGS) \
- 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-@@ -831,20 +863,23 @@
- 	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
- 	        distuninstallcheck \
- 	  && chmod -R a-w "$$dc_install_base" \
--	  && ({   $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-+	  && ({ \
-+	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
- 	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
- 	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
- 	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
- 	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
- 	  && rm -rf "$$dc_destdir" \
--	  && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
--	  && rm -f $(distdir).tar.gz \
-+	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-+	  && rm -rf $(DIST_ARCHIVES) \
- 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
- 	$(am__remove_distdir)
--	@echo "$(distdir).tar.gz is ready for distribution" | \
--	  sed 'h;s/./=/g;p;x;p;x'
-+	@(echo "$(distdir) archives ready for distribution: "; \
-+	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-+	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
- distuninstallcheck:
--	cd $(distuninstallcheck_dir) \
-+	@cd $(distuninstallcheck_dir) \
- 	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
- 	   || { echo "ERROR: files left after uninstall:" ; \
- 	        if test -n "$(DESTDIR)"; then \
-@@ -853,22 +888,25 @@
- 	        $(distuninstallcheck_listfiles) ; \
- 	        exit 1; } >&2
- distcleancheck: distclean
--	if test '$(srcdir)' = . ; then \
-+	@if test '$(srcdir)' = . ; then \
- 	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
- 	  exit 1 ; \
- 	fi
--	test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-+	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
- 	  || { echo "ERROR: files left in build directory after distclean:" ; \
- 	       $(distcleancheck_listfiles) ; \
- 	       exit 1; } >&2
- check-am: all-am
--check: check-recursive
-+check: $(BUILT_SOURCES)
-+	$(MAKE) $(AM_MAKEFLAGS) check-recursive
- all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(HEADERS) config.h
- installdirs: installdirs-recursive
- installdirs-am:
--	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(includedir)
--
--install: install-recursive
-+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includedir)"; do \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	done
-+install: $(BUILT_SOURCES)
-+	$(MAKE) $(AM_MAKEFLAGS) install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
- uninstall: uninstall-recursive
-@@ -879,7 +917,7 @@
- installcheck: installcheck-recursive
- install-strip:
- 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
--	  INSTALL_STRIP_FLAG=-s \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- 	  `test -z '$(STRIP)' || \
- 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
-@@ -887,16 +925,16 @@
- clean-generic:
- 
- distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+	-rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
- 	@echo "This command is intended for maintainers to use"
- 	@echo "it deletes files that may require special tools to rebuild."
--	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
- 	-rm -f parse.h
- 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
--	-rm -f parse.c
- 	-rm -f scan.c
-+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-+	-rm -f parse.c
- clean: clean-recursive
- 
- clean-am: clean-binPROGRAMS clean-generic clean-libLIBRARIES \
-@@ -904,13 +942,17 @@
- 
- distclean: distclean-recursive
- 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
--distclean-am: clean-am distclean-compile distclean-depend \
--	distclean-generic distclean-hdr distclean-tags
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-compile distclean-generic \
-+	distclean-hdr distclean-tags
- 
- dvi: dvi-recursive
- 
- dvi-am:
- 
-+html: html-recursive
-+
- info: info-recursive
- 
- info-am:
-@@ -927,7 +969,9 @@
- 
- maintainer-clean: maintainer-clean-recursive
- 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
--	-rm -rf autom4te.cache
-+	-rm -rf $(top_srcdir)/autom4te.cache
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
- maintainer-clean-am: distclean-am maintainer-clean-generic
- 
- mostlyclean: mostlyclean-recursive
-@@ -947,28 +991,24 @@
- 
- uninstall-info: uninstall-info-recursive
- 
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
--	clean-binPROGRAMS clean-generic clean-libLIBRARIES \
--	clean-recursive ctags ctags-recursive dist dist-all dist-bzip2 \
--	dist-gzip distcheck distclean distclean-compile \
--	distclean-depend distclean-generic distclean-hdr \
--	distclean-recursive distclean-tags distcleancheck distdir \
--	distuninstallcheck dvi dvi-am dvi-recursive info info-am \
--	info-recursive install install-am install-binPROGRAMS \
--	install-data install-data-am install-data-recursive \
--	install-exec install-exec-am install-exec-recursive \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
-+	check-am clean clean-binPROGRAMS clean-generic \
-+	clean-libLIBRARIES clean-recursive ctags ctags-recursive dist \
-+	dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip \
-+	distcheck distclean distclean-compile distclean-generic \
-+	distclean-hdr distclean-recursive distclean-tags \
-+	distcleancheck distdir distuninstallcheck dvi dvi-am html \
-+	html-am info info-am install install-am install-binPROGRAMS \
-+	install-data install-data-am install-exec install-exec-am \
- 	install-includeHEADERS install-info install-info-am \
--	install-info-recursive install-libLIBRARIES install-man \
--	install-recursive install-strip installcheck installcheck-am \
--	installcheck-binPROGRAMS installdirs installdirs-am \
--	installdirs-recursive maintainer-clean maintainer-clean-generic \
-+	install-libLIBRARIES install-man install-strip installcheck \
-+	installcheck-am installcheck-binPROGRAMS installdirs \
-+	installdirs-am maintainer-clean maintainer-clean-generic \
- 	maintainer-clean-recursive mostlyclean mostlyclean-compile \
--	mostlyclean-generic mostlyclean-recursive pdf pdf-am \
--	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
--	uninstall uninstall-am uninstall-binPROGRAMS \
--	uninstall-includeHEADERS uninstall-info-am \
--	uninstall-info-recursive uninstall-libLIBRARIES \
--	uninstall-recursive
-+	mostlyclean-generic mostlyclean-recursive pdf pdf-am ps ps-am \
-+	tags tags-recursive uninstall uninstall-am \
-+	uninstall-binPROGRAMS uninstall-includeHEADERS \
-+	uninstall-info-am uninstall-libLIBRARIES
- 
- 
- skel.c: flex.skl mkskel.sh flexint.h tables_shared.h
-diff -Naur flex-2.5.31.orig/aclocal.m4 flex-2.5.31/aclocal.m4
---- flex-2.5.31.orig/aclocal.m4	2003-04-01 16:32:12.000000000 +0000
-+++ flex-2.5.31/aclocal.m4	2005-01-08 07:43:01.366973304 +0000
-@@ -1,6 +1,6 @@
--# generated automatically by aclocal 1.7 -*- Autoconf -*-
-+# generated automatically by aclocal 1.8.5 -*- Autoconf -*-
- 
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
- # Free Software Foundation, Inc.
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -11,129 +11,9 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
- 
--# Do all the work for Automake.                            -*- Autoconf -*-
--
--# This macro actually does too much some checks are only needed if
--# your package does certain things.  But this isn't really a big deal.
--
--# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
--# 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
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
--# serial 8
--
--# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
--# written in clear, in which case automake, when reading aclocal.m4,
--# will think it sees a *use*, and therefore will trigger all it's
--# C support machinery.  Also note that it means that autoscan, seeing
--# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
--
--
--AC_PREREQ([2.54])
--
--# Autoconf 2.50 wants to disallow AM_ names.  We explicitly allow
--# the ones we care about.
--m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
--
--# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
--# AM_INIT_AUTOMAKE([OPTIONS])
--# -----------------------------------------------
--# The call with PACKAGE and VERSION arguments is the old style
--# call (pre autoconf-2.50), which is being phased out.  PACKAGE
--# and VERSION should now be passed to AC_INIT and removed from
--# the call to AM_INIT_AUTOMAKE.
--# We support both call styles for the transition.  After
--# the next Automake release, Autoconf can make the AC_INIT
--# arguments mandatory, and then we can depend on a new Autoconf
--# release and drop the old call support.
--AC_DEFUN([AM_INIT_AUTOMAKE],
--[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-- AC_REQUIRE([AC_PROG_INSTALL])dnl
--# test to see if srcdir already configured
--if test "`cd $srcdir && pwd`" != "`pwd`" &&
--   test -f $srcdir/config.status; then
--  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
--fi
--
--# test whether we have cygpath
--if test -z "$CYGPATH_W"; then
--  if (cygpath --version) >/dev/null 2>/dev/null; then
--    CYGPATH_W='cygpath -w'
--  else
--    CYGPATH_W=echo
--  fi
--fi
--AC_SUBST([CYGPATH_W])
--
--# Define the identity of the package.
--dnl Distinguish between old-style and new-style calls.
--m4_ifval([$2],
--[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
-- AC_SUBST([PACKAGE], [$1])dnl
-- AC_SUBST([VERSION], [$2])],
--[_AM_SET_OPTIONS([$1])dnl
-- AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl
-- AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl
--
--_AM_IF_OPTION([no-define],,
--[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
--
--# Some tools Automake needs.
--AC_REQUIRE([AM_SANITY_CHECK])dnl
--AC_REQUIRE([AC_ARG_PROGRAM])dnl
--AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
--AM_MISSING_PROG(AUTOCONF, autoconf)
--AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
--AM_MISSING_PROG(AUTOHEADER, autoheader)
--AM_MISSING_PROG(MAKEINFO, makeinfo)
--AM_MISSING_PROG(AMTAR, tar)
--AM_PROG_INSTALL_SH
--AM_PROG_INSTALL_STRIP
--# We need awk for the "check" target.  The system "awk" is bad on
--# some platforms.
--AC_REQUIRE([AC_PROG_AWK])dnl
--AC_REQUIRE([AC_PROG_MAKE_SET])dnl
--
--_AM_IF_OPTION([no-dependencies],,
--[AC_PROVIDE_IFELSE([AC_PROG_CC],
--                  [_AM_DEPENDENCIES(CC)],
--                  [define([AC_PROG_CC],
--                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
--AC_PROVIDE_IFELSE([AC_PROG_CXX],
--                  [_AM_DEPENDENCIES(CXX)],
--                  [define([AC_PROG_CXX],
--                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
--])
--])
--
--
--# When config.status generates a header, we must update the stamp-h file.
--# This file resides in the same directory as the config header
--# that is generated.  The stamp files are numbered to have different names.
--
--# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
--# loop where config.status creates the headers, so we can generate
--# our stamp files there.
--AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
--[_am_stamp_count=`expr ${_am_stamp_count-0} + 1`
--echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
--
--# Copyright 2002  Free Software Foundation, Inc.
-+#                                                        -*- Autoconf -*-
-+# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
-+# Generated from amversion.in; do not edit by hand.
- 
- # 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
-@@ -153,18 +33,18 @@
- # ----------------------------
- # Automake X.Y traces this macro to ensure aclocal.m4 has been
- # generated from the m4 files accompanying Automake X.Y.
--AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"])
-+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.8"])
- 
- # AM_SET_CURRENT_AUTOMAKE_VERSION
- # -------------------------------
- # Call AM_AUTOMAKE_VERSION so it can be traced.
- # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--	 [AM_AUTOMAKE_VERSION([1.7])])
-+	 [AM_AUTOMAKE_VERSION([1.8.5])])
- 
--# Helper functions for option handling.                    -*- Autoconf -*-
-+# AM_AUX_DIR_EXPAND
- 
--# Copyright 2001, 2002  Free Software Foundation, Inc.
-+# Copyright (C) 2001, 2003 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
-@@ -181,36 +61,54 @@
- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- # 02111-1307, USA.
- 
--# serial 2
--
--# _AM_MANGLE_OPTION(NAME)
--# -----------------------
--AC_DEFUN([_AM_MANGLE_OPTION],
--[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
--
--# _AM_SET_OPTION(NAME)
--# ------------------------------
--# Set option NAME.  Presently that only means defining a flag for this option.
--AC_DEFUN([_AM_SET_OPTION],
--[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
--
--# _AM_SET_OPTIONS(OPTIONS)
--# ----------------------------------
--# OPTIONS is a space-separated list of Automake options.
--AC_DEFUN([_AM_SET_OPTIONS],
--[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
--
--# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
--# -------------------------------------------
--# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
--AC_DEFUN([_AM_IF_OPTION],
--[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
--
-+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-+# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
- #
--# Check to make sure that the build environment is sane.
-+# Of course, Automake must honor this variable whenever it calls a
-+# tool from the auxiliary directory.  The problem is that $srcdir (and
-+# therefore $ac_aux_dir as well) can be either absolute or relative,
-+# depending on how configure is run.  This is pretty annoying, since
-+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-+# source directory, any form will work fine, but in subdirectories a
-+# relative path needs to be adjusted first.
-+#
-+# $ac_aux_dir/missing
-+#    fails when called from a subdirectory if $ac_aux_dir is relative
-+# $top_srcdir/$ac_aux_dir/missing
-+#    fails if $ac_aux_dir is absolute,
-+#    fails when called from a subdirectory in a VPATH build with
-+#          a relative $ac_aux_dir
-+#
-+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-+# are both prefixed by $srcdir.  In an in-source build this is usually
-+# harmless because $srcdir is `.', but things will broke when you
-+# start a VPATH build or use an absolute $srcdir.
-+#
-+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-+# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-+#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-+# and then we would define $MISSING as
-+#   MISSING="\${SHELL} $am_aux_dir/missing"
-+# This will work as long as MISSING is not called from configure, because
-+# unfortunately $(top_srcdir) has no meaning in configure.
-+# However there are other variables, like CC, which are often used in
-+# configure, and could therefore not use this "fixed" $ac_aux_dir.
- #
-+# Another solution, used here, is to always expand $ac_aux_dir to an
-+# absolute PATH.  The drawback is that using absolute paths prevent a
-+# configured tree to be moved without reconfiguration.
-+
-+AC_DEFUN([AM_AUX_DIR_EXPAND],
-+[dnl Rely on autoconf to set up CDPATH properly.
-+AC_PREREQ([2.50])dnl
-+# expand $ac_aux_dir to an absolute path
-+am_aux_dir=`cd $ac_aux_dir && pwd`
-+])
-+
-+# AM_CONDITIONAL                                              -*- Autoconf -*-
- 
--# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
-+# Copyright (C) 1997, 2000, 2001, 2003 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
-@@ -227,53 +125,34 @@
- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- # 02111-1307, USA.
- 
--# serial 3
--
--# AM_SANITY_CHECK
--# ---------------
--AC_DEFUN([AM_SANITY_CHECK],
--[AC_MSG_CHECKING([whether build environment is sane])
--# Just in case
--sleep 1
--echo timestamp > conftest.file
--# Do `set' in a subshell so we don't clobber the current shell's
--# arguments.  Must try -L first in case configure is actually a
--# symlink; some systems play weird games with the mod time of symlinks
--# (eg FreeBSD returns the mod time of the symlink's containing
--# directory).
--if (
--   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
--   if test "$[*]" = "X"; then
--      # -L didn't work.
--      set X `ls -t $srcdir/configure conftest.file`
--   fi
--   rm -f conftest.file
--   if test "$[*]" != "X $srcdir/configure conftest.file" \
--      && test "$[*]" != "X conftest.file $srcdir/configure"; then
--
--      # If neither matched, then we have a broken ls.  This can happen
--      # if, for instance, CONFIG_SHELL is bash and it inherits a
--      # broken ls alias from the environment.  This has actually
--      # happened.  Such a system could not be considered "sane".
--      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
--alias in your environment])
--   fi
-+# serial 6
- 
--   test "$[2]" = conftest.file
--   )
--then
--   # Ok.
--   :
-+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-+# -------------------------------------
-+# Define a conditional.
-+AC_DEFUN([AM_CONDITIONAL],
-+[AC_PREREQ(2.52)dnl
-+ ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-+	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-+AC_SUBST([$1_TRUE])
-+AC_SUBST([$1_FALSE])
-+if $2; then
-+  $1_TRUE=
-+  $1_FALSE='#'
- else
--   AC_MSG_ERROR([newly created file is older than distributed files!
--Check your system clock])
-+  $1_TRUE='#'
-+  $1_FALSE=
- fi
--AC_MSG_RESULT(yes)])
--
--#  -*- Autoconf -*-
-+AC_CONFIG_COMMANDS_PRE(
-+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-+  AC_MSG_ERROR([conditional "$1" was never defined.
-+Usually this means the macro was only invoked conditionally.])
-+fi])])
- 
-+# serial 7						-*- Autoconf -*-
- 
--# Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
-+# 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
-@@ -290,187 +169,12 @@
- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- # 02111-1307, USA.
- 
--# serial 3
- 
--# AM_MISSING_PROG(NAME, PROGRAM)
--# ------------------------------
--AC_DEFUN([AM_MISSING_PROG],
--[AC_REQUIRE([AM_MISSING_HAS_RUN])
--$1=${$1-"${am_missing_run}$2"}
--AC_SUBST($1)])
--
--
--# AM_MISSING_HAS_RUN
--# ------------------
--# Define MISSING if not defined so far and test if it supports --run.
--# If it does, set am_missing_run to use it, otherwise, to nothing.
--AC_DEFUN([AM_MISSING_HAS_RUN],
--[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
--test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
--# Use eval to expand $SHELL
--if eval "$MISSING --run true"; then
--  am_missing_run="$MISSING --run "
--else
--  am_missing_run=
--  AC_MSG_WARN([`missing' script is too old or missing])
--fi
--])
--
--# AM_AUX_DIR_EXPAND
--
--# Copyright 2001 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
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
--# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
--# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
--# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
--#
--# Of course, Automake must honor this variable whenever it calls a
--# tool from the auxiliary directory.  The problem is that $srcdir (and
--# therefore $ac_aux_dir as well) can be either absolute or relative,
--# depending on how configure is run.  This is pretty annoying, since
--# it makes $ac_aux_dir quite unusable in subdirectories: in the top
--# source directory, any form will work fine, but in subdirectories a
--# relative path needs to be adjusted first.
--#
--# $ac_aux_dir/missing
--#    fails when called from a subdirectory if $ac_aux_dir is relative
--# $top_srcdir/$ac_aux_dir/missing
--#    fails if $ac_aux_dir is absolute,
--#    fails when called from a subdirectory in a VPATH build with
--#          a relative $ac_aux_dir
--#
--# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
--# are both prefixed by $srcdir.  In an in-source build this is usually
--# harmless because $srcdir is `.', but things will broke when you
--# start a VPATH build or use an absolute $srcdir.
--#
--# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
--# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
--#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
--# and then we would define $MISSING as
--#   MISSING="\${SHELL} $am_aux_dir/missing"
--# This will work as long as MISSING is not called from configure, because
--# unfortunately $(top_srcdir) has no meaning in configure.
--# However there are other variables, like CC, which are often used in
--# configure, and could therefore not use this "fixed" $ac_aux_dir.
--#
--# Another solution, used here, is to always expand $ac_aux_dir to an
--# absolute PATH.  The drawback is that using absolute paths prevent a
--# configured tree to be moved without reconfiguration.
--
--# Rely on autoconf to set up CDPATH properly.
--AC_PREREQ([2.50])
--
--AC_DEFUN([AM_AUX_DIR_EXPAND], [
--# expand $ac_aux_dir to an absolute path
--am_aux_dir=`cd $ac_aux_dir && pwd`
--])
--
--# AM_PROG_INSTALL_SH
--# ------------------
--# Define $install_sh.
--
--# Copyright 2001 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
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
--AC_DEFUN([AM_PROG_INSTALL_SH],
--[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
--install_sh=${install_sh-"$am_aux_dir/install-sh"}
--AC_SUBST(install_sh)])
--
--# AM_PROG_INSTALL_STRIP
--
--# Copyright 2001 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
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
--# One issue with vendor `install' (even GNU) is that you can't
--# specify the program used to strip binaries.  This is especially
--# annoying in cross-compiling environments, where the build's strip
--# is unlikely to handle the host's binaries.
--# Fortunately install-sh will honor a STRIPPROG variable, so we
--# always use install-sh in `make install-strip', and initialize
--# STRIPPROG with the value of the STRIP variable (set by the user).
--AC_DEFUN([AM_PROG_INSTALL_STRIP],
--[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
--# Installed binaries are usually stripped using `strip' when the user
--# run `make install-strip'.  However `strip' might not be the right
--# tool to use in cross-compilation environments, therefore Automake
--# will honor the `STRIP' environment variable to overrule this program.
--dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
--if test "$cross_compiling" != no; then
--  AC_CHECK_TOOL([STRIP], [strip], :)
--fi
--INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
--AC_SUBST([INSTALL_STRIP_PROGRAM])])
--
--# serial 4						-*- Autoconf -*-
--
--# Copyright 1999, 2000, 2001 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
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
--
--# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
--# written in clear, in which case automake, when reading aclocal.m4,
--# will think it sees a *use*, and therefore will trigger all it's
--# C support machinery.  Also note that it means that autoscan, seeing
--# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-+# written in clear, in which case automake, when reading aclocal.m4,
-+# will think it sees a *use*, and therefore will trigger all it's
-+# C support machinery.  Also note that it means that autoscan, seeing
-+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
- 
- 
- 
-@@ -509,18 +213,34 @@
-   # using a relative directory.
-   cp "$am_depcomp" conftest.dir
-   cd conftest.dir
-+  # We will build objects and dependencies in a subdirectory because
-+  # it helps to detect inapplicable dependency modes.  For instance
-+  # both Tru64's cc and ICC support -MD to output dependencies as a
-+  # side effect of compilation, but ICC will put the dependencies in
-+  # the current directory while Tru64 will put them in the object
-+  # directory.
-+  mkdir sub
- 
-   am_cv_$1_dependencies_compiler_type=none
-   if test "$am_compiler_list" = ""; then
-      am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-   fi
-   for depmode in $am_compiler_list; do
-+    # Setup a source with many dependencies, because some compilers
-+    # like to wrap large dependency lists on column 80 (with \), and
-+    # we should not choose a depcomp mode which is confused by this.
-+    #
-     # We need to recreate these files for each test, as the compiler may
-     # overwrite some of them when testing with obscure command lines.
-     # This happens at least with the AIX C compiler.
--    echo '#include "conftest.h"' > conftest.c
--    echo 'int i;' > conftest.h
--    echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
-+    : > sub/conftest.c
-+    for i in 1 2 3 4 5 6; do
-+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+      # Solaris 8's {/usr,}/bin/sh.
-+      touch sub/conftst$i.h
-+    done
-+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
- 
-     case $depmode in
-     nosideeffect)
-@@ -538,13 +258,25 @@
-     # mode.  It turns out that the SunPro C++ compiler does not properly
-     # handle `-M -o', and we need to detect this.
-     if depmode=$depmode \
--       source=conftest.c object=conftest.o \
--       depfile=conftest.Po tmpdepfile=conftest.TPo \
--       $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
--       grep conftest.h conftest.Po > /dev/null 2>&1 &&
-+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-+         >/dev/null 2>conftest.err &&
-+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
--      am_cv_$1_dependencies_compiler_type=$depmode
--      break
-+      # icc doesn't choke on unknown options, it will just issue warnings
-+      # or remarks (even with -Werror).  So we grep stderr for any message
-+      # that says an option was ignored or not supported.
-+      # When given -MP, icc 7.0 and 7.1 complain thusly:
-+      #   icc: Command line warning: ignoring option '-M'; no argument required
-+      # The diagnosis changed in icc 8.0:
-+      #   icc: Command line remark: option '-MP' not supported
-+      if (grep 'ignoring option' conftest.err ||
-+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-+        am_cv_$1_dependencies_compiler_type=$depmode
-+        break
-+      fi
-     fi
-   done
- 
-@@ -566,16 +298,8 @@
- # Choose a directory name for dependency files.
- # This macro is AC_REQUIREd in _AM_DEPENDENCIES
- AC_DEFUN([AM_SET_DEPDIR],
--[rm -f .deps 2>/dev/null
--mkdir .deps 2>/dev/null
--if test -d .deps; then
--  DEPDIR=.deps
--else
--  # MS-DOS does not allow filenames that begin with a dot.
--  DEPDIR=_deps
--fi
--rmdir .deps 2>/dev/null
--AC_SUBST([DEPDIR])
-+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
- ])
- 
- 
-@@ -583,8 +307,8 @@
- # ------------
- AC_DEFUN([AM_DEP_TRACK],
- [AC_ARG_ENABLE(dependency-tracking,
--[  --disable-dependency-tracking Speeds up one-time builds
--  --enable-dependency-tracking  Do not reject slow dependency extractors])
-+[  --disable-dependency-tracking  speeds up one-time build
-+  --enable-dependency-tracking   do not reject slow dependency extractors])
- if test "x$enable_dependency_tracking" != xno; then
-   am_depcomp="$ac_aux_dir/depcomp"
-   AMDEPBACKSLASH='\'
-@@ -595,7 +319,7 @@
- 
- # Generate code to set up dependency tracking.   -*- Autoconf -*-
- 
--# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 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
-@@ -634,14 +358,14 @@
-   grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
-   # Extract the definition of DEP_FILES from the Makefile without
-   # running `make'.
--  DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
-+  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-   test -z "$DEPDIR" && continue
-   # When using ansi2knr, U may be empty or an underscore; expand it
--  U=`sed -n -e '/^U = / s///p' < "$mf"`
-+  U=`sed -n 's/^U = //p' < "$mf"`
-   test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
-   # We invoke sed twice because it is the simplest approach to
-   # changing $(DEPDIR) to its actual value in the expansion.
--  for file in `sed -n -e '
-+  for file in `sed -n '
-     /^DEP_FILES = .*\\\\$/ {
-       s/^DEP_FILES = //
-       :loop
-@@ -677,9 +401,13 @@
-      [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
- ])
- 
--# Check to see how 'make' treats includes.	-*- Autoconf -*-
-+# Do all the work for Automake.                            -*- Autoconf -*-
-+
-+# This macro actually does too much some checks are only needed if
-+# your package does certain things.  But this isn't really a big deal.
- 
--# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-+# 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
-@@ -696,2012 +424,463 @@
- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- # 02111-1307, USA.
- 
--# serial 2
-+# serial 11
- 
--# AM_MAKE_INCLUDE()
--# -----------------
--# Check to see how make treats includes.
--AC_DEFUN([AM_MAKE_INCLUDE],
--[am_make=${MAKE-make}
--cat > confinc << 'END'
--doit:
--	@echo done
--END
--# If we don't find an include directive, just comment out the code.
--AC_MSG_CHECKING([for style of include used by $am_make])
--am__include="#"
--am__quote=
--_am_result=none
--# First try GNU make style include.
--echo "include confinc" > confmf
--# We grep out `Entering directory' and `Leaving directory'
--# messages which can occur if `w' ends up in MAKEFLAGS.
--# In particular we don't look at `^make:' because GNU make might
--# be invoked under some other name (usually "gmake"), in which
--# case it prints its new name instead of `make'.
--if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
--   am__include=include
--   am__quote=
--   _am_result=GNU
--fi
--# Now try BSD make style include.
--if test "$am__include" = "#"; then
--   echo '.include "confinc"' > confmf
--   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
--      am__include=.include
--      am__quote="\""
--      _am_result=BSD
--   fi
-+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-+# AM_INIT_AUTOMAKE([OPTIONS])
-+# -----------------------------------------------
-+# The call with PACKAGE and VERSION arguments is the old style
-+# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-+# and VERSION should now be passed to AC_INIT and removed from
-+# the call to AM_INIT_AUTOMAKE.
-+# We support both call styles for the transition.  After
-+# the next Automake release, Autoconf can make the AC_INIT
-+# arguments mandatory, and then we can depend on a new Autoconf
-+# release and drop the old call support.
-+AC_DEFUN([AM_INIT_AUTOMAKE],
-+[AC_PREREQ([2.58])dnl
-+dnl Autoconf wants to disallow AM_ names.  We explicitly allow
-+dnl the ones we care about.
-+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-+AC_REQUIRE([AC_PROG_INSTALL])dnl
-+# test to see if srcdir already configured
-+if test "`cd $srcdir && pwd`" != "`pwd`" &&
-+   test -f $srcdir/config.status; then
-+  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
- fi
--AC_SUBST(am__include)
--AC_SUBST(am__quote)
--AC_MSG_RESULT($_am_result)
--rm -f confinc confmf
--])
- 
--# AM_CONDITIONAL                                              -*- Autoconf -*-
--
--# Copyright 1997, 2000, 2001 Free Software Foundation, Inc.
-+# test whether we have cygpath
-+if test -z "$CYGPATH_W"; then
-+  if (cygpath --version) >/dev/null 2>/dev/null; then
-+    CYGPATH_W='cygpath -w'
-+  else
-+    CYGPATH_W=echo
-+  fi
-+fi
-+AC_SUBST([CYGPATH_W])
- 
--# 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
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
-+# Define the identity of the package.
-+dnl Distinguish between old-style and new-style calls.
-+m4_ifval([$2],
-+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
-+ AC_SUBST([PACKAGE], [$1])dnl
-+ AC_SUBST([VERSION], [$2])],
-+[_AM_SET_OPTIONS([$1])dnl
-+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
-+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
- 
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
-+_AM_IF_OPTION([no-define],,
-+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
- 
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# Some tools Automake needs.
-+AC_REQUIRE([AM_SANITY_CHECK])dnl
-+AC_REQUIRE([AC_ARG_PROGRAM])dnl
-+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-+AM_MISSING_PROG(AUTOCONF, autoconf)
-+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-+AM_MISSING_PROG(AUTOHEADER, autoheader)
-+AM_MISSING_PROG(MAKEINFO, makeinfo)
-+AM_MISSING_PROG(AMTAR, tar)
-+AM_PROG_INSTALL_SH
-+AM_PROG_INSTALL_STRIP
-+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-+# We need awk for the "check" target.  The system "awk" is bad on
-+# some platforms.
-+AC_REQUIRE([AC_PROG_AWK])dnl
-+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-+
-+_AM_IF_OPTION([no-dependencies],,
-+[AC_PROVIDE_IFELSE([AC_PROG_CC],
-+                  [_AM_DEPENDENCIES(CC)],
-+                  [define([AC_PROG_CC],
-+                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-+AC_PROVIDE_IFELSE([AC_PROG_CXX],
-+                  [_AM_DEPENDENCIES(CXX)],
-+                  [define([AC_PROG_CXX],
-+                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-+])
-+])
-+
-+
-+# When config.status generates a header, we must update the stamp-h file.
-+# This file resides in the same directory as the config header
-+# that is generated.  The stamp files are numbered to have different names.
-+
-+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-+# loop where config.status creates the headers, so we can generate
-+# our stamp files there.
-+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-+[# Compute $1's index in $config_headers.
-+_am_stamp_count=1
-+for _am_header in $config_headers :; do
-+  case $_am_header in
-+    $1 | $1:* )
-+      break ;;
-+    * )
-+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-+  esac
-+done
-+echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-+
-+# AM_PROG_INSTALL_SH
-+# ------------------
-+# Define $install_sh.
-+
-+# Copyright (C) 2001, 2003 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
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- # 02111-1307, USA.
- 
--# serial 5
-+AC_DEFUN([AM_PROG_INSTALL_SH],
-+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-+install_sh=${install_sh-"$am_aux_dir/install-sh"}
-+AC_SUBST(install_sh)])
- 
--AC_PREREQ(2.52)
-+#                                                          -*- Autoconf -*-
-+# Copyright (C) 2003  Free Software Foundation, Inc.
- 
--# AM_CONDITIONAL(NAME, SHELL-CONDITION)
--# -------------------------------------
--# Define a conditional.
--AC_DEFUN([AM_CONDITIONAL],
--[ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
--        [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
--AC_SUBST([$1_TRUE])
--AC_SUBST([$1_FALSE])
--if $2; then
--  $1_TRUE=
--  $1_FALSE='#'
-+# 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
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
-+
-+# serial 1
-+
-+# Check whether the underlying file-system supports filenames
-+# with a leading dot.  For instance MS-DOS doesn't.
-+AC_DEFUN([AM_SET_LEADING_DOT],
-+[rm -rf .tst 2>/dev/null
-+mkdir .tst 2>/dev/null
-+if test -d .tst; then
-+  am__leading_dot=.
- else
--  $1_TRUE='#'
--  $1_FALSE=
-+  am__leading_dot=_
- fi
--AC_CONFIG_COMMANDS_PRE(
--[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
--  AC_MSG_ERROR([conditional "$1" was never defined.
--Usually this means the macro was only invoked conditionally.])
--fi])])
-+rmdir .tst 2>/dev/null
-+AC_SUBST([am__leading_dot])])
- 
--# gettext.m4 serial 17 (gettext-0.11.5)
--dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
--dnl This file is free software, distributed under the terms of the GNU
--dnl General Public License.  As a special exception to the GNU General
--dnl Public License, this file may be distributed as part of a program
--dnl that contains a configuration script generated by Autoconf, under
--dnl the same distribution terms as the rest of that program.
--dnl
--dnl This file can can be used in projects which are not available under
--dnl the GNU General Public License or the GNU Library General Public
--dnl License but which still want to provide support for the GNU gettext
--dnl functionality.
--dnl Please note that the actual code of the GNU gettext library is covered
--dnl by the GNU Library General Public License, and the rest of the GNU
--dnl gettext package package is covered by the GNU General Public License.
--dnl They are *not* in the public domain.
--
--dnl Authors:
--dnl   Ulrich Drepper <drepper at cygnus.com>, 1995-2000.
--dnl   Bruno Haible <haible at clisp.cons.org>, 2000-2002.
--
--dnl Macro to add for using GNU gettext.
--
--dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
--dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The
--dnl    default (if it is not specified or empty) is 'no-libtool'.
--dnl    INTLSYMBOL should be 'external' for packages with no intl directory,
--dnl    and 'no-libtool' or 'use-libtool' for packages with an intl directory.
--dnl    If INTLSYMBOL is 'use-libtool', then a libtool library
--dnl    $(top_builddir)/intl/libintl.la will be created (shared and/or static,
--dnl    depending on --{enable,disable}-{shared,static} and on the presence of
--dnl    AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library
--dnl    $(top_builddir)/intl/libintl.a will be created.
--dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
--dnl    implementations (in libc or libintl) without the ngettext() function
--dnl    will be ignored.  If NEEDSYMBOL is specified and is
--dnl    'need-formatstring-macros', then GNU gettext implementations that don't
--dnl    support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
--dnl INTLDIR is used to find the intl libraries.  If empty,
--dnl    the value `$(top_builddir)/intl/' is used.
--dnl
--dnl The result of the configuration is one of three cases:
--dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
--dnl    and used.
--dnl    Catalog format: GNU --> install in $(datadir)
--dnl    Catalog extension: .mo after installation, .gmo in source tree
--dnl 2) GNU gettext has been found in the system's C library.
--dnl    Catalog format: GNU --> install in $(datadir)
--dnl    Catalog extension: .mo after installation, .gmo in source tree
--dnl 3) No internationalization, always use English msgid.
--dnl    Catalog format: none
--dnl    Catalog extension: none
--dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
--dnl The use of .gmo is historical (it was needed to avoid overwriting the
--dnl GNU format catalogs when building on a platform with an X/Open gettext),
--dnl but we keep it in order not to force irrelevant filename changes on the
--dnl maintainers.
--dnl
--AC_DEFUN([AM_GNU_GETTEXT],
--[
--  dnl Argument checking.
--  ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
--    [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
--])])])])])
--  ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
--    [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
--])])])])
--  define(gt_included_intl, ifelse([$1], [external], [no], [yes]))
--  define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], []))
--
--  AC_REQUIRE([AM_PO_SUBDIRS])dnl
--  ifelse(gt_included_intl, yes, [
--    AC_REQUIRE([AM_INTL_SUBDIR])dnl
--  ])
--
--  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
--  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
--  AC_REQUIRE([AC_LIB_RPATH])
--
--  dnl Sometimes libintl requires libiconv, so first search for libiconv.
--  dnl Ideally we would do this search only after the
--  dnl      if test "$USE_NLS" = "yes"; then
--  dnl        if test "$gt_cv_func_gnugettext_libc" != "yes"; then
--  dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
--  dnl the configure script would need to contain the same shell code
--  dnl again, outside any 'if'. There are two solutions:
--  dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
--  dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
--  dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
--  dnl documented, we avoid it.
--  ifelse(gt_included_intl, yes, , [
--    AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
--  ])
--
--  AC_MSG_CHECKING([whether NLS is requested])
--  dnl Default is enabled NLS
--  AC_ARG_ENABLE(nls,
--    [  --disable-nls           do not use Native Language Support],
--    USE_NLS=$enableval, USE_NLS=yes)
--  AC_MSG_RESULT($USE_NLS)
--  AC_SUBST(USE_NLS)
--
--  ifelse(gt_included_intl, yes, [
--    BUILD_INCLUDED_LIBINTL=no
--    USE_INCLUDED_LIBINTL=no
--  ])
--  LIBINTL=
--  LTLIBINTL=
--  POSUB=
--
--  dnl If we use NLS figure out what method
--  if test "$USE_NLS" = "yes"; then
--    gt_use_preinstalled_gnugettext=no
--    ifelse(gt_included_intl, yes, [
--      AC_MSG_CHECKING([whether included gettext is requested])
--      AC_ARG_WITH(included-gettext,
--        [  --with-included-gettext use the GNU gettext library included here],
--        nls_cv_force_use_gnu_gettext=$withval,
--        nls_cv_force_use_gnu_gettext=no)
--      AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
--
--      nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
--      if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
--    ])
--        dnl User does not insist on using GNU NLS library.  Figure out what
--        dnl to use.  If GNU gettext is available we use this.  Else we have
--        dnl to fall back to GNU NLS library.
--
--        dnl Add a version number to the cache macros.
--        define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1)))
--        define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc])
--        define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl])
--
--        AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
--         [AC_TRY_LINK([#include <libintl.h>
--]ifelse([$2], [need-formatstring-macros],
--[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
--#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
--#endif
--changequote(,)dnl
--typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
--changequote([,])dnl
--], [])[extern int _nl_msg_cat_cntr;
--extern int *_nl_domain_bindings;],
--            [bindtextdomain ("", "");
--return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
--            gt_cv_func_gnugettext_libc=yes,
--            gt_cv_func_gnugettext_libc=no)])
--
--        if test "$gt_cv_func_gnugettext_libc" != "yes"; then
--          dnl Sometimes libintl requires libiconv, so first search for libiconv.
--          ifelse(gt_included_intl, yes, , [
--            AM_ICONV_LINK
--          ])
--          dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
--          dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
--          dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
--          dnl even if libiconv doesn't exist.
--          AC_LIB_LINKFLAGS_BODY([intl])
--          AC_CACHE_CHECK([for GNU gettext in libintl],
--            gt_cv_func_gnugettext_libintl,
--           [gt_save_CPPFLAGS="$CPPFLAGS"
--            CPPFLAGS="$CPPFLAGS $INCINTL"
--            gt_save_LIBS="$LIBS"
--            LIBS="$LIBS $LIBINTL"
--            dnl Now see whether libintl exists and does not depend on libiconv.
--            AC_TRY_LINK([#include <libintl.h>
--]ifelse([$2], [need-formatstring-macros],
--[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
--#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
--#endif
--changequote(,)dnl
--typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
--changequote([,])dnl
--], [])[extern int _nl_msg_cat_cntr;
--extern
--#ifdef __cplusplus
--"C"
--#endif
--const char *_nl_expand_alias ();],
--              [bindtextdomain ("", "");
--return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
--              gt_cv_func_gnugettext_libintl=yes,
--              gt_cv_func_gnugettext_libintl=no)
--            dnl Now see whether libintl exists and depends on libiconv.
--            if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then
--              LIBS="$LIBS $LIBICONV"
--              AC_TRY_LINK([#include <libintl.h>
--]ifelse([$2], [need-formatstring-macros],
--[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
--#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
--#endif
--changequote(,)dnl
--typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
--changequote([,])dnl
--], [])[extern int _nl_msg_cat_cntr;
--extern
--#ifdef __cplusplus
--"C"
--#endif
--const char *_nl_expand_alias ();],
--                [bindtextdomain ("", "");
--return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
--               [LIBINTL="$LIBINTL $LIBICONV"
--                LTLIBINTL="$LTLIBINTL $LTLIBICONV"
--                gt_cv_func_gnugettext_libintl=yes
--               ])
--            fi
--            CPPFLAGS="$gt_save_CPPFLAGS"
--            LIBS="$gt_save_LIBS"])
--        fi
--
--        dnl If an already present or preinstalled GNU gettext() is found,
--        dnl use it.  But if this macro is used in GNU gettext, and GNU
--        dnl gettext is already preinstalled in libintl, we update this
--        dnl libintl.  (Cf. the install rule in intl/Makefile.in.)
--        if test "$gt_cv_func_gnugettext_libc" = "yes" \
--           || { test "$gt_cv_func_gnugettext_libintl" = "yes" \
--                && test "$PACKAGE" != gettext; }; then
--          gt_use_preinstalled_gnugettext=yes
--        else
--          dnl Reset the values set by searching for libintl.
--          LIBINTL=
--          LTLIBINTL=
--          INCINTL=
--        fi
--
--    ifelse(gt_included_intl, yes, [
--        if test "$gt_use_preinstalled_gnugettext" != "yes"; then
--          dnl GNU gettext is not found in the C library.
--          dnl Fall back on included GNU gettext library.
--          nls_cv_use_gnu_gettext=yes
--        fi
--      fi
- 
--      if test "$nls_cv_use_gnu_gettext" = "yes"; then
--        dnl Mark actions used to generate GNU NLS library.
--        INTLOBJS="\$(GETTOBJS)"
--        BUILD_INCLUDED_LIBINTL=yes
--        USE_INCLUDED_LIBINTL=yes
--        LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV"
--        LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV"
--        LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
--      fi
-+# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003
-+# Free Software Foundation, Inc.
- 
--      if test "$gt_use_preinstalled_gnugettext" = "yes" \
--         || test "$nls_cv_use_gnu_gettext" = "yes"; then
--        dnl Mark actions to use GNU gettext tools.
--        CATOBJEXT=.gmo
--      fi
--    ])
-+# 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
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
- 
--    if test "$gt_use_preinstalled_gnugettext" = "yes" \
--       || test "$nls_cv_use_gnu_gettext" = "yes"; then
--      AC_DEFINE(ENABLE_NLS, 1,
--        [Define to 1 if translation of program messages to the user's native language
--   is requested.])
--    else
--      USE_NLS=no
--    fi
--  fi
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
- 
--  if test "$USE_NLS" = "yes"; then
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
- 
--    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
--      if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
--        AC_MSG_CHECKING([how to link with libintl])
--        AC_MSG_RESULT([$LIBINTL])
--        AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
--      fi
-+# serial 4
- 
--      dnl For backward compatibility. Some packages may be using this.
--      AC_DEFINE(HAVE_GETTEXT, 1,
--       [Define if the GNU gettext() function is already present or preinstalled.])
--      AC_DEFINE(HAVE_DCGETTEXT, 1,
--       [Define if the GNU dcgettext() function is already present or preinstalled.])
--    fi
-+# AM_PROG_LEX
-+# -----------
-+# Autoconf leaves LEX=: if lex or flex can't be found.  Change that to a
-+# "missing" invocation, for better error output.
-+AC_DEFUN([AM_PROG_LEX],
-+[AC_PREREQ(2.50)dnl
-+AC_REQUIRE([AM_MISSING_HAS_RUN])dnl
-+AC_REQUIRE([AC_PROG_LEX])dnl
-+if test "$LEX" = :; then
-+  LEX=${am_missing_run}flex
-+fi])
- 
--    dnl We need to process the po/ directory.
--    POSUB=po
--  fi
-+# Add --enable-maintainer-mode option to configure.
-+# From Jim Meyering
- 
--  ifelse(gt_included_intl, yes, [
--    dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
--    dnl to 'yes' because some of the testsuite requires it.
--    if test "$PACKAGE" = gettext; then
--      BUILD_INCLUDED_LIBINTL=yes
--    fi
-+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004
-+# Free Software Foundation, Inc.
- 
--    dnl Make all variables we use known to autoconf.
--    AC_SUBST(BUILD_INCLUDED_LIBINTL)
--    AC_SUBST(USE_INCLUDED_LIBINTL)
--    AC_SUBST(CATOBJEXT)
--    AC_SUBST(INTLOBJS)
--
--    dnl For backward compatibility. Some configure.ins may be using this.
--    nls_cv_header_intl=
--    nls_cv_header_libgt=
--
--    dnl For backward compatibility. Some Makefiles may be using this.
--    DATADIRNAME=share
--    AC_SUBST(DATADIRNAME)
--
--    dnl For backward compatibility. Some Makefiles may be using this.
--    INSTOBJEXT=.mo
--    AC_SUBST(INSTOBJEXT)
--
--    dnl For backward compatibility. Some Makefiles may be using this.
--    GENCAT=gencat
--    AC_SUBST(GENCAT)
--
--    dnl Enable libtool support if the surrounding package wishes it.
--    INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
--    AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
--  ])
--
--  dnl For backward compatibility. Some Makefiles may be using this.
--  INTLLIBS="$LIBINTL"
--  AC_SUBST(INTLLIBS)
--
--  dnl Make all documented variables known to autoconf.
--  AC_SUBST(LIBINTL)
--  AC_SUBST(LTLIBINTL)
--  AC_SUBST(POSUB)
--])
-+# 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
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
- 
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
- 
--dnl Checks for all prerequisites of the po subdirectory,
--dnl except for USE_NLS.
--AC_DEFUN([AM_PO_SUBDIRS],
--[
--  AC_REQUIRE([AC_PROG_MAKE_SET])dnl
--  AC_REQUIRE([AC_PROG_INSTALL])dnl
--  AC_REQUIRE([AM_MKINSTALLDIRS])dnl
--
--  dnl Perform the following tests also if --disable-nls has been given,
--  dnl because they are needed for "make dist" to work.
--
--  dnl Search for GNU msgfmt in the PATH.
--  dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
--  dnl The second test excludes FreeBSD msgfmt.
--  AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
--    [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
--     (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
--    :)
--  AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
--
--  dnl Search for GNU xgettext 0.11 or newer in the PATH.
--  dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
--  dnl The second test excludes FreeBSD xgettext.
--  AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
--    [$ac_dir/$ac_word --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
--     (if $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
--    :)
--  dnl Remove leftover from FreeBSD xgettext call.
--  rm -f messages.po
--
--  dnl Search for GNU msgmerge 0.11 or newer in the PATH.
--  AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
--    [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :)
--
--  dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
--  dnl Test whether we really found GNU msgfmt.
--  if test "$GMSGFMT" != ":"; then
--    dnl If it is no GNU msgfmt we define it as : so that the
--    dnl Makefiles still can work.
--    if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
--       (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
--      : ;
--    else
--      GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
--      AC_MSG_RESULT(
--        [found $GMSGFMT program is not GNU msgfmt; ignore it])
--      GMSGFMT=":"
--    fi
--  fi
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
- 
--  dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
--  dnl Test whether we really found GNU xgettext.
--  if test "$XGETTEXT" != ":"; then
--    dnl If it is no GNU xgettext we define it as : so that the
--    dnl Makefiles still can work.
--    if $XGETTEXT --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
--       (if $XGETTEXT --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
--      : ;
--    else
--      AC_MSG_RESULT(
--        [found xgettext program is not GNU xgettext; ignore it])
--      XGETTEXT=":"
--    fi
--    dnl Remove leftover from FreeBSD xgettext call.
--    rm -f messages.po
--  fi
-+# serial 3
- 
--  AC_OUTPUT_COMMANDS([
--    for ac_file in $CONFIG_FILES; do
--      # Support "outfile[:infile[:infile...]]"
--      case "$ac_file" in
--        *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
--      esac
--      # PO directories have a Makefile.in generated from Makefile.in.in.
--      case "$ac_file" in */Makefile.in)
--        # Adjust a relative srcdir.
--        ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
--        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
--        ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
--        # In autoconf-2.13 it is called $ac_given_srcdir.
--        # In autoconf-2.50 it is called $srcdir.
--        test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
--        case "$ac_given_srcdir" in
--          .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
--          /*) top_srcdir="$ac_given_srcdir" ;;
--          *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
--        esac
--        if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
--          rm -f "$ac_dir/POTFILES"
--          test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
--          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
--          # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend
--          # on $ac_dir but don't depend on user-specified configuration
--          # parameters.
--          if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
--            # The LINGUAS file contains the set of available languages.
--            if test -n "$ALL_LINGUAS"; then
--              test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
--            fi
--            ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
--            # Hide the ALL_LINGUAS assigment from automake.
--            eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
--          fi
--          case "$ac_given_srcdir" in
--            .) srcdirpre= ;;
--            *) srcdirpre='$(srcdir)/' ;;
--          esac
--          POFILES=
--          GMOFILES=
--          UPDATEPOFILES=
--          DUMMYPOFILES=
--          for lang in $ALL_LINGUAS; do
--            POFILES="$POFILES $srcdirpre$lang.po"
--            GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
--            UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
--            DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
--          done
--          # CATALOGS depends on both $ac_dir and the user's LINGUAS
--          # environment variable.
--          INST_LINGUAS=
--          if test -n "$ALL_LINGUAS"; then
--            for presentlang in $ALL_LINGUAS; do
--              useit=no
--              if test "%UNSET%" != "$LINGUAS"; then
--                desiredlanguages="$LINGUAS"
--              else
--                desiredlanguages="$ALL_LINGUAS"
--              fi
--              for desiredlang in $desiredlanguages; do
--                # Use the presentlang catalog if desiredlang is
--                #   a. equal to presentlang, or
--                #   b. a variant of presentlang (because in this case,
--                #      presentlang can be used as a fallback for messages
--                #      which are not translated in the desiredlang catalog).
--                case "$desiredlang" in
--                  "$presentlang"*) useit=yes;;
--                esac
--              done
--              if test $useit = yes; then
--                INST_LINGUAS="$INST_LINGUAS $presentlang"
--              fi
--            done
--          fi
--          CATALOGS=
--          if test -n "$INST_LINGUAS"; then
--            for lang in $INST_LINGUAS; do
--              CATALOGS="$CATALOGS $lang.gmo"
--            done
--          fi
--          test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
--          sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
--          for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
--            if test -f "$f"; then
--              case "$f" in
--                *.orig | *.bak | *~) ;;
--                *) cat "$f" >> "$ac_dir/Makefile" ;;
--              esac
--            fi
--          done
--        fi
--        ;;
--      esac
--    done],
--   [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
--    # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it
--    # from automake.
--    eval 'ALL_LINGUAS''="$ALL_LINGUAS"'
--    # Capture the value of LINGUAS because we need it to compute CATALOGS.
--    LINGUAS="${LINGUAS-%UNSET%}"
--   ])
--])
-+AC_DEFUN([AM_MAINTAINER_MODE],
-+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-+  dnl maintainer-mode is disabled by default
-+  AC_ARG_ENABLE(maintainer-mode,
-+[  --enable-maintainer-mode  enable make rules and dependencies not useful
-+			  (and sometimes confusing) to the casual installer],
-+      USE_MAINTAINER_MODE=$enableval,
-+      USE_MAINTAINER_MODE=no)
-+  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
-+  AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
-+  MAINT=$MAINTAINER_MODE_TRUE
-+  AC_SUBST(MAINT)dnl
-+]
-+)
- 
-+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
- 
--dnl Checks for all prerequisites of the intl subdirectory,
--dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
--dnl            USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
--AC_DEFUN([AM_INTL_SUBDIR],
--[
--  AC_REQUIRE([AC_PROG_INSTALL])dnl
--  AC_REQUIRE([AM_MKINSTALLDIRS])dnl
--  AC_REQUIRE([AC_PROG_CC])dnl
--  AC_REQUIRE([AC_CANONICAL_HOST])dnl
--  AC_REQUIRE([AC_PROG_RANLIB])dnl
--  AC_REQUIRE([AC_ISC_POSIX])dnl
--  AC_REQUIRE([AC_HEADER_STDC])dnl
--  AC_REQUIRE([AC_C_CONST])dnl
--  AC_REQUIRE([AC_C_INLINE])dnl
--  AC_REQUIRE([AC_TYPE_OFF_T])dnl
--  AC_REQUIRE([AC_TYPE_SIZE_T])dnl
--  AC_REQUIRE([AC_FUNC_ALLOCA])dnl
--  AC_REQUIRE([AC_FUNC_MMAP])dnl
--  AC_REQUIRE([jm_GLIBC21])dnl
--  AC_REQUIRE([gt_INTDIV0])dnl
--  AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl
--  AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
--  AC_REQUIRE([gt_INTTYPES_PRI])dnl
--
--  AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
--stdlib.h string.h unistd.h sys/param.h])
--  AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getc_unlocked getcwd getegid \
--geteuid getgid getuid mempcpy munmap putenv setenv setlocale stpcpy \
--strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
--
--  AM_ICONV
--  AM_LANGINFO_CODESET
--  if test $ac_cv_header_locale_h = yes; then
--    AM_LC_MESSAGES
--  fi
-+# Check to see how 'make' treats includes.	-*- Autoconf -*-
- 
--  dnl intl/plural.c is generated from intl/plural.y. It requires bison,
--  dnl because plural.y uses bison specific features. It requires at least
--  dnl bison-1.26 because earlier versions generate a plural.c that doesn't
--  dnl compile.
--  dnl bison is only needed for the maintainer (who touches plural.y). But in
--  dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
--  dnl the rule in general Makefile. Now, some people carelessly touch the
--  dnl files or have a broken "make" program, hence the plural.c rule will
--  dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
--  dnl present or too old.
--  AC_CHECK_PROGS([INTLBISON], [bison])
--  if test -z "$INTLBISON"; then
--    ac_verc_fail=yes
--  else
--    dnl Found it, now check the version.
--    AC_MSG_CHECKING([version of bison])
--changequote(<<,>>)dnl
--    ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
--    case $ac_prog_version in
--      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
--      1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
--changequote([,])dnl
--         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
--      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
--    esac
--    AC_MSG_RESULT([$ac_prog_version])
--  fi
--  if test $ac_verc_fail = yes; then
--    INTLBISON=:
--  fi
--])
-+# Copyright (C) 2001, 2002, 2003 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
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
- 
--AC_DEFUN([AM_MKINSTALLDIRS],
--[
--  dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
--  dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
--  dnl Try to locate is.
--  MKINSTALLDIRS=
--  if test -n "$ac_aux_dir"; then
--    MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
--  fi
--  if test -z "$MKINSTALLDIRS"; then
--    MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
--  fi
--  AC_SUBST(MKINSTALLDIRS)
--])
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
- 
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
- 
--dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
--AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
-+# serial 2
- 
--# lib-prefix.m4 serial 1 (gettext-0.11)
--dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
--dnl This file is free software, distributed under the terms of the GNU
--dnl General Public License.  As a special exception to the GNU General
--dnl Public License, this file may be distributed as part of a program
--dnl that contains a configuration script generated by Autoconf, under
--dnl the same distribution terms as the rest of that program.
--
--dnl From Bruno Haible.
--
--dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
--dnl to access previously installed libraries. The basic assumption is that
--dnl a user will want packages to use other packages he previously installed
--dnl with the same --prefix option.
--dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
--dnl libraries, but is otherwise very convenient.
--AC_DEFUN([AC_LIB_PREFIX],
--[
--  AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
--  AC_REQUIRE([AC_PROG_CC])
--  AC_REQUIRE([AC_CANONICAL_HOST])
--  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
--  dnl By default, look in $includedir and $libdir.
--  use_additional=yes
--  AC_LIB_WITH_FINAL_PREFIX([
--    eval additional_includedir=\"$includedir\"
--    eval additional_libdir=\"$libdir\"
--  ])
--  AC_ARG_WITH([lib-prefix],
--[  --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
--  --without-lib-prefix    don't search for libraries in includedir and libdir],
--[
--    if test "X$withval" = "Xno"; then
--      use_additional=no
--    else
--      if test "X$withval" = "X"; then
--        AC_LIB_WITH_FINAL_PREFIX([
--          eval additional_includedir=\"$includedir\"
--          eval additional_libdir=\"$libdir\"
--        ])
--      else
--        additional_includedir="$withval/include"
--        additional_libdir="$withval/lib"
--      fi
--    fi
--])
--  if test $use_additional = yes; then
--    dnl Potentially add $additional_includedir to $CPPFLAGS.
--    dnl But don't add it
--    dnl   1. if it's the standard /usr/include,
--    dnl   2. if it's already present in $CPPFLAGS,
--    dnl   3. if it's /usr/local/include and we are using GCC on Linux,
--    dnl   4. if it doesn't exist as a directory.
--    if test "X$additional_includedir" != "X/usr/include"; then
--      haveit=
--      for x in $CPPFLAGS; do
--        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
--        if test "X$x" = "X-I$additional_includedir"; then
--          haveit=yes
--          break
--        fi
--      done
--      if test -z "$haveit"; then
--        if test "X$additional_includedir" = "X/usr/local/include"; then
--          if test -n "$GCC"; then
--            case $host_os in
--              linux*) haveit=yes;;
--            esac
--          fi
--        fi
--        if test -z "$haveit"; then
--          if test -d "$additional_includedir"; then
--            dnl Really add $additional_includedir to $CPPFLAGS.
--            CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
--          fi
--        fi
--      fi
--    fi
--    dnl Potentially add $additional_libdir to $LDFLAGS.
--    dnl But don't add it
--    dnl   1. if it's the standard /usr/lib,
--    dnl   2. if it's already present in $LDFLAGS,
--    dnl   3. if it's /usr/local/lib and we are using GCC on Linux,
--    dnl   4. if it doesn't exist as a directory.
--    if test "X$additional_libdir" != "X/usr/lib"; then
--      haveit=
--      for x in $LDFLAGS; do
--        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
--        if test "X$x" = "X-L$additional_libdir"; then
--          haveit=yes
--          break
--        fi
--      done
--      if test -z "$haveit"; then
--        if test "X$additional_libdir" = "X/usr/local/lib"; then
--          if test -n "$GCC"; then
--            case $host_os in
--              linux*) haveit=yes;;
--            esac
--          fi
--        fi
--        if test -z "$haveit"; then
--          if test -d "$additional_libdir"; then
--            dnl Really add $additional_libdir to $LDFLAGS.
--            LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
--          fi
--        fi
--      fi
--    fi
--  fi
-+# AM_MAKE_INCLUDE()
-+# -----------------
-+# Check to see how make treats includes.
-+AC_DEFUN([AM_MAKE_INCLUDE],
-+[am_make=${MAKE-make}
-+cat > confinc << 'END'
-+am__doit:
-+	@echo done
-+.PHONY: am__doit
-+END
-+# If we don't find an include directive, just comment out the code.
-+AC_MSG_CHECKING([for style of include used by $am_make])
-+am__include="#"
-+am__quote=
-+_am_result=none
-+# First try GNU make style include.
-+echo "include confinc" > confmf
-+# We grep out `Entering directory' and `Leaving directory'
-+# messages which can occur if `w' ends up in MAKEFLAGS.
-+# In particular we don't look at `^make:' because GNU make might
-+# be invoked under some other name (usually "gmake"), in which
-+# case it prints its new name instead of `make'.
-+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-+   am__include=include
-+   am__quote=
-+   _am_result=GNU
-+fi
-+# Now try BSD make style include.
-+if test "$am__include" = "#"; then
-+   echo '.include "confinc"' > confmf
-+   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-+      am__include=.include
-+      am__quote="\""
-+      _am_result=BSD
-+   fi
-+fi
-+AC_SUBST([am__include])
-+AC_SUBST([am__quote])
-+AC_MSG_RESULT([$_am_result])
-+rm -f confinc confmf
- ])
- 
--dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
--dnl acl_final_exec_prefix, containing the values to which $prefix and
--dnl $exec_prefix will expand at the end of the configure script.
--AC_DEFUN([AC_LIB_PREPARE_PREFIX],
--[
--  dnl Unfortunately, prefix and exec_prefix get only finally determined
--  dnl at the end of configure.
--  if test "X$prefix" = "XNONE"; then
--    acl_final_prefix="$ac_default_prefix"
--  else
--    acl_final_prefix="$prefix"
--  fi
--  if test "X$exec_prefix" = "XNONE"; then
--    acl_final_exec_prefix='${prefix}'
--  else
--    acl_final_exec_prefix="$exec_prefix"
--  fi
--  acl_save_prefix="$prefix"
--  prefix="$acl_final_prefix"
--  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
--  prefix="$acl_save_prefix"
--])
-+#  -*- Autoconf -*-
- 
--dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
--dnl variables prefix and exec_prefix bound to the values they will have
--dnl at the end of the configure script.
--AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
--[
--  acl_save_prefix="$prefix"
--  prefix="$acl_final_prefix"
--  acl_save_exec_prefix="$exec_prefix"
--  exec_prefix="$acl_final_exec_prefix"
--  $1
--  exec_prefix="$acl_save_exec_prefix"
--  prefix="$acl_save_prefix"
--])
- 
--# lib-link.m4 serial 3 (gettext-0.11.3)
--dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
--dnl This file is free software, distributed under the terms of the GNU
--dnl General Public License.  As a special exception to the GNU General
--dnl Public License, this file may be distributed as part of a program
--dnl that contains a configuration script generated by Autoconf, under
--dnl the same distribution terms as the rest of that program.
--
--dnl From Bruno Haible.
--
--dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
--dnl the libraries corresponding to explicit and implicit dependencies.
--dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
--dnl augments the CPPFLAGS variable.
--AC_DEFUN([AC_LIB_LINKFLAGS],
--[
--  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
--  AC_REQUIRE([AC_LIB_RPATH])
--  define([Name],[translit([$1],[./-], [___])])
--  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
--                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
--  AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
--    AC_LIB_LINKFLAGS_BODY([$1], [$2])
--    ac_cv_lib[]Name[]_libs="$LIB[]NAME"
--    ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
--    ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
--  ])
--  LIB[]NAME="$ac_cv_lib[]Name[]_libs"
--  LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
--  INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
--  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
--  AC_SUBST([LIB]NAME)
--  AC_SUBST([LTLIB]NAME)
--  dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
--  dnl results of this search when this library appears as a dependency.
--  HAVE_LIB[]NAME=yes
--  undefine([Name])
--  undefine([NAME])
--])
-+# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
- 
--dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
--dnl searches for libname and the libraries corresponding to explicit and
--dnl implicit dependencies, together with the specified include files and
--dnl the ability to compile and link the specified testcode. If found, it
--dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
--dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
--dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
--dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
--AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
--[
--  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
--  AC_REQUIRE([AC_LIB_RPATH])
--  define([Name],[translit([$1],[./-], [___])])
--  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
--                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
--
--  dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
--  dnl accordingly.
--  AC_LIB_LINKFLAGS_BODY([$1], [$2])
--
--  dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
--  dnl because if the user has installed lib[]Name and not disabled its use
--  dnl via --without-lib[]Name-prefix, he wants to use it.
--  ac_save_CPPFLAGS="$CPPFLAGS"
--  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
--
--  AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
--    ac_save_LIBS="$LIBS"
--    LIBS="$LIBS $LIB[]NAME"
--    AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
--    LIBS="$ac_save_LIBS"
--  ])
--  if test "$ac_cv_lib[]Name" = yes; then
--    HAVE_LIB[]NAME=yes
--    AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
--    AC_MSG_CHECKING([how to link with lib[]$1])
--    AC_MSG_RESULT([$LIB[]NAME])
--  else
--    HAVE_LIB[]NAME=no
--    dnl If $LIB[]NAME didn't lead to a usable library, we don't need
--    dnl $INC[]NAME either.
--    CPPFLAGS="$ac_save_CPPFLAGS"
--    LIB[]NAME=
--    LTLIB[]NAME=
--  fi
--  AC_SUBST([HAVE_LIB]NAME)
--  AC_SUBST([LIB]NAME)
--  AC_SUBST([LTLIB]NAME)
--  undefine([Name])
--  undefine([NAME])
--])
-+# 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
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
- 
--dnl Determine the platform dependent parameters needed to use rpath:
--dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
--dnl hardcode_direct, hardcode_minus_L,
--dnl sys_lib_search_path_spec, sys_lib_dlsearch_path_spec.
--AC_DEFUN([AC_LIB_RPATH],
--[
--  AC_REQUIRE([AC_PROG_CC])                dnl we use $CC, $GCC, $LDFLAGS
--  AC_REQUIRE([AC_LIB_PROG_LD])            dnl we use $LD, $with_gnu_ld
--  AC_REQUIRE([AC_CANONICAL_HOST])         dnl we use $host
--  AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
--  AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
--    CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
--    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
--    . ./conftest.sh
--    rm -f ./conftest.sh
--    acl_cv_rpath=done
--  ])
--  wl="$acl_cv_wl"
--  libext="$acl_cv_libext"
--  shlibext="$acl_cv_shlibext"
--  hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
--  hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
--  hardcode_direct="$acl_cv_hardcode_direct"
--  hardcode_minus_L="$acl_cv_hardcode_minus_L"
--  sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec"
--  sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec"
--  dnl Determine whether the user wants rpath handling at all.
--  AC_ARG_ENABLE(rpath,
--    [  --disable-rpath         do not hardcode runtime library paths],
--    :, enable_rpath=yes)
--])
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
- 
--dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
--dnl the libraries corresponding to explicit and implicit dependencies.
--dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
--AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
--[
--  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
--                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
--  dnl By default, look in $includedir and $libdir.
--  use_additional=yes
--  AC_LIB_WITH_FINAL_PREFIX([
--    eval additional_includedir=\"$includedir\"
--    eval additional_libdir=\"$libdir\"
--  ])
--  AC_ARG_WITH([lib$1-prefix],
--[  --with-lib$1-prefix[=DIR]  search for lib$1 in DIR/include and DIR/lib
--  --without-lib$1-prefix     don't search for lib$1 in includedir and libdir],
--[
--    if test "X$withval" = "Xno"; then
--      use_additional=no
--    else
--      if test "X$withval" = "X"; then
--        AC_LIB_WITH_FINAL_PREFIX([
--          eval additional_includedir=\"$includedir\"
--          eval additional_libdir=\"$libdir\"
--        ])
--      else
--        additional_includedir="$withval/include"
--        additional_libdir="$withval/lib"
--      fi
--    fi
--])
--  dnl Search the library and its dependencies in $additional_libdir and
--  dnl $LDFLAGS. Using breadth-first-seach.
--  LIB[]NAME=
--  LTLIB[]NAME=
--  INC[]NAME=
--  rpathdirs=
--  ltrpathdirs=
--  names_already_handled=
--  names_next_round='$1 $2'
--  while test -n "$names_next_round"; do
--    names_this_round="$names_next_round"
--    names_next_round=
--    for name in $names_this_round; do
--      already_handled=
--      for n in $names_already_handled; do
--        if test "$n" = "$name"; then
--          already_handled=yes
--          break
--        fi
--      done
--      if test -z "$already_handled"; then
--        names_already_handled="$names_already_handled $name"
--        dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
--        dnl or AC_LIB_HAVE_LINKFLAGS call.
--        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
--        eval value=\"\$HAVE_LIB$uppername\"
--        if test -n "$value"; then
--          if test "$value" = yes; then
--            eval value=\"\$LIB$uppername\"
--            test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
--            eval value=\"\$LTLIB$uppername\"
--            test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
--          else
--            dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
--            dnl that this library doesn't exist. So just drop it.
--            :
--          fi
--        else
--          dnl Search the library lib$name in $additional_libdir and $LDFLAGS
--          dnl and the already constructed $LIBNAME/$LTLIBNAME.
--          found_dir=
--          found_la=
--          found_so=
--          found_a=
--          if test $use_additional = yes; then
--            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
--              found_dir="$additional_libdir"
--              found_so="$additional_libdir/lib$name.$shlibext"
--              if test -f "$additional_libdir/lib$name.la"; then
--                found_la="$additional_libdir/lib$name.la"
--              fi
--            else
--              if test -f "$additional_libdir/lib$name.$libext"; then
--                found_dir="$additional_libdir"
--                found_a="$additional_libdir/lib$name.$libext"
--                if test -f "$additional_libdir/lib$name.la"; then
--                  found_la="$additional_libdir/lib$name.la"
--                fi
--              fi
--            fi
--          fi
--          if test "X$found_dir" = "X"; then
--            for x in $LDFLAGS $LTLIB[]NAME; do
--              AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
--              case "$x" in
--                -L*)
--                  dir=`echo "X$x" | sed -e 's/^X-L//'`
--                  if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
--                    found_dir="$dir"
--                    found_so="$dir/lib$name.$shlibext"
--                    if test -f "$dir/lib$name.la"; then
--                      found_la="$dir/lib$name.la"
--                    fi
--                  else
--                    if test -f "$dir/lib$name.$libext"; then
--                      found_dir="$dir"
--                      found_a="$dir/lib$name.$libext"
--                      if test -f "$dir/lib$name.la"; then
--                        found_la="$dir/lib$name.la"
--                      fi
--                    fi
--                  fi
--                  ;;
--              esac
--              if test "X$found_dir" != "X"; then
--                break
--              fi
--            done
--          fi
--          if test "X$found_dir" != "X"; then
--            dnl Found the library.
--            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
--            if test "X$found_so" != "X"; then
--              dnl Linking with a shared library. We attempt to hardcode its
--              dnl directory into the executable's runpath, unless it's the
--              dnl standard /usr/lib.
--              if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
--                dnl No hardcoding is needed.
--                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
--              else
--                dnl Use an explicit option to hardcode DIR into the resulting
--                dnl binary.
--                dnl Potentially add DIR to ltrpathdirs.
--                dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
--                haveit=
--                for x in $ltrpathdirs; do
--                  if test "X$x" = "X$found_dir"; then
--                    haveit=yes
--                    break
--                  fi
--                done
--                if test -z "$haveit"; then
--                  ltrpathdirs="$ltrpathdirs $found_dir"
--                fi
--                dnl The hardcoding into $LIBNAME is system dependent.
--                if test "$hardcode_direct" = yes; then
--                  dnl Using DIR/libNAME.so during linking hardcodes DIR into the
--                  dnl resulting binary.
--                  LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
--                else
--                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
--                    dnl Use an explicit option to hardcode DIR into the resulting
--                    dnl binary.
--                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
--                    dnl Potentially add DIR to rpathdirs.
--                    dnl The rpathdirs will be appended to $LIBNAME at the end.
--                    haveit=
--                    for x in $rpathdirs; do
--                      if test "X$x" = "X$found_dir"; then
--                        haveit=yes
--                        break
--                      fi
--                    done
--                    if test -z "$haveit"; then
--                      rpathdirs="$rpathdirs $found_dir"
--                    fi
--                  else
--                    dnl Rely on "-L$found_dir".
--                    dnl But don't add it if it's already contained in the LDFLAGS
--                    dnl or the already constructed $LIBNAME
--                    haveit=
--                    for x in $LDFLAGS $LIB[]NAME; do
--                      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
--                      if test "X$x" = "X-L$found_dir"; then
--                        haveit=yes
--                        break
--                      fi
--                    done
--                    if test -z "$haveit"; then
--                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
--                    fi
--                    if test "$hardcode_minus_L" != no; then
--                      dnl FIXME: Not sure whether we should use
--                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
--                      dnl here.
--                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
--                    else
--                      dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
--                      dnl here, because this doesn't fit in flags passed to the
--                      dnl compiler. So give up. No hardcoding. This affects only
--                      dnl very old systems.
--                      dnl FIXME: Not sure whether we should use
--                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
--                      dnl here.
--                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
--                    fi
--                  fi
--                fi
--              fi
--            else
--              if test "X$found_a" != "X"; then
--                dnl Linking with a static library.
--                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
--              else
--                dnl We shouldn't come here, but anyway it's good to have a
--                dnl fallback.
--                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
--              fi
--            fi
--            dnl Assume the include files are nearby.
--            additional_includedir=
--            case "$found_dir" in
--              */lib | */lib/)
--                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
--                additional_includedir="$basedir/include"
--                ;;
--            esac
--            if test "X$additional_includedir" != "X"; then
--              dnl Potentially add $additional_includedir to $INCNAME.
--              dnl But don't add it
--              dnl   1. if it's the standard /usr/include,
--              dnl   2. if it's /usr/local/include and we are using GCC on Linux,
--              dnl   3. if it's already present in $CPPFLAGS or the already
--              dnl      constructed $INCNAME,
--              dnl   4. if it doesn't exist as a directory.
--              if test "X$additional_includedir" != "X/usr/include"; then
--                haveit=
--                if test "X$additional_includedir" = "X/usr/local/include"; then
--                  if test -n "$GCC"; then
--                    case $host_os in
--                      linux*) haveit=yes;;
--                    esac
--                  fi
--                fi
--                if test -z "$haveit"; then
--                  for x in $CPPFLAGS $INC[]NAME; do
--                    AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
--                    if test "X$x" = "X-I$additional_includedir"; then
--                      haveit=yes
--                      break
--                    fi
--                  done
--                  if test -z "$haveit"; then
--                    if test -d "$additional_includedir"; then
--                      dnl Really add $additional_includedir to $INCNAME.
--                      INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
--                    fi
--                  fi
--                fi
--              fi
--            fi
--            dnl Look for dependencies.
--            if test -n "$found_la"; then
--              dnl Read the .la file. It defines the variables
--              dnl dlname, library_names, old_library, dependency_libs, current,
--              dnl age, revision, installed, dlopen, dlpreopen, libdir.
--              save_libdir="$libdir"
--              case "$found_la" in
--                */* | *\\*) . "$found_la" ;;
--                *) . "./$found_la" ;;
--              esac
--              libdir="$save_libdir"
--              dnl We use only dependency_libs.
--              for dep in $dependency_libs; do
--                case "$dep" in
--                  -L*)
--                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
--                    dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
--                    dnl But don't add it
--                    dnl   1. if it's the standard /usr/lib,
--                    dnl   2. if it's /usr/local/lib and we are using GCC on Linux,
--                    dnl   3. if it's already present in $LDFLAGS or the already
--                    dnl      constructed $LIBNAME,
--                    dnl   4. if it doesn't exist as a directory.
--                    if test "X$additional_libdir" != "X/usr/lib"; then
--                      haveit=
--                      if test "X$additional_libdir" = "X/usr/local/lib"; then
--                        if test -n "$GCC"; then
--                          case $host_os in
--                            linux*) haveit=yes;;
--                          esac
--                        fi
--                      fi
--                      if test -z "$haveit"; then
--                        haveit=
--                        for x in $LDFLAGS $LIB[]NAME; do
--                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
--                          if test "X$x" = "X-L$additional_libdir"; then
--                            haveit=yes
--                            break
--                          fi
--                        done
--                        if test -z "$haveit"; then
--                          if test -d "$additional_libdir"; then
--                            dnl Really add $additional_libdir to $LIBNAME.
--                            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
--                          fi
--                        fi
--                        haveit=
--                        for x in $LDFLAGS $LTLIB[]NAME; do
--                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
--                          if test "X$x" = "X-L$additional_libdir"; then
--                            haveit=yes
--                            break
--                          fi
--                        done
--                        if test -z "$haveit"; then
--                          if test -d "$additional_libdir"; then
--                            dnl Really add $additional_libdir to $LTLIBNAME.
--                            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
--                          fi
--                        fi
--                      fi
--                    fi
--                    ;;
--                  -R*)
--                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
--                    if test "$enable_rpath" != no; then
--                      dnl Potentially add DIR to rpathdirs.
--                      dnl The rpathdirs will be appended to $LIBNAME at the end.
--                      haveit=
--                      for x in $rpathdirs; do
--                        if test "X$x" = "X$dir"; then
--                          haveit=yes
--                          break
--                        fi
--                      done
--                      if test -z "$haveit"; then
--                        rpathdirs="$rpathdirs $dir"
--                      fi
--                      dnl Potentially add DIR to ltrpathdirs.
--                      dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
--                      haveit=
--                      for x in $ltrpathdirs; do
--                        if test "X$x" = "X$dir"; then
--                          haveit=yes
--                          break
--                        fi
--                      done
--                      if test -z "$haveit"; then
--                        ltrpathdirs="$ltrpathdirs $dir"
--                      fi
--                    fi
--                    ;;
--                  -l*)
--                    dnl Handle this in the next round.
--                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
--                    ;;
--                  *.la)
--                    dnl Handle this in the next round. Throw away the .la's
--                    dnl directory; it is already contained in a preceding -L
--                    dnl option.
--                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
--                    ;;
--                  *)
--                    dnl Most likely an immediate library name.
--                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
--                    LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
--                    ;;
--                esac
--              done
--            fi
--          else
--            dnl Didn't find the library; assume it is in the system directories
--            dnl known to the linker and runtime loader. (All the system
--            dnl directories known to the linker should also be known to the
--            dnl runtime loader, otherwise the system is severely misconfigured.)
--            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
--            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
--          fi
--        fi
--      fi
--    done
--  done
--  if test "X$rpathdirs" != "X"; then
--    if test -n "$hardcode_libdir_separator"; then
--      dnl Weird platform: only the last -rpath option counts, the user must
--      dnl pass all path elements in one option. We can arrange that for a
--      dnl single library, but not when more than one $LIBNAMEs are used.
--      alldirs=
--      for found_dir in $rpathdirs; do
--        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
--      done
--      dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl.
--      acl_save_libdir="$libdir"
--      libdir="$alldirs"
--      eval flag=\"$hardcode_libdir_flag_spec\"
--      libdir="$acl_save_libdir"
--      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
--    else
--      dnl The -rpath options are cumulative.
--      for found_dir in $rpathdirs; do
--        acl_save_libdir="$libdir"
--        libdir="$found_dir"
--        eval flag=\"$hardcode_libdir_flag_spec\"
--        libdir="$acl_save_libdir"
--        LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
--      done
--    fi
--  fi
--  if test "X$ltrpathdirs" != "X"; then
--    dnl When using libtool, the option that works for both libraries and
--    dnl executables is -R. The -R options are cumulative.
--    for found_dir in $ltrpathdirs; do
--      LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
--    done
--  fi
--])
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
- 
--dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
--dnl unless already present in VAR.
--dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
--dnl contains two or three consecutive elements that belong together.
--AC_DEFUN([AC_LIB_APPENDTOVAR],
--[
--  for element in [$2]; do
--    haveit=
--    for x in $[$1]; do
--      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
--      if test "X$x" = "X$element"; then
--        haveit=yes
--        break
--      fi
--    done
--    if test -z "$haveit"; then
--      [$1]="${[$1]}${[$1]:+ }$element"
--    fi
--  done
--])
-+# serial 3
- 
--# lib-ld.m4 serial 1 (gettext-0.11)
--dnl Copyright (C) 1996-2002 Free Software Foundation, Inc.
--dnl This file is free software, distributed under the terms of the GNU
--dnl General Public License.  As a special exception to the GNU General
--dnl Public License, this file may be distributed as part of a program
--dnl that contains a configuration script generated by Autoconf, under
--dnl the same distribution terms as the rest of that program.
--
--dnl Subroutines of libtool.m4,
--dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
--dnl with libtool.m4.
--
--dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
--AC_DEFUN([AC_LIB_PROG_LD_GNU],
--[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
--[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
--if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
--  acl_cv_prog_gnu_ld=yes
--else
--  acl_cv_prog_gnu_ld=no
--fi])
--with_gnu_ld=$acl_cv_prog_gnu_ld
--])
-+# AM_MISSING_PROG(NAME, PROGRAM)
-+# ------------------------------
-+AC_DEFUN([AM_MISSING_PROG],
-+[AC_REQUIRE([AM_MISSING_HAS_RUN])
-+$1=${$1-"${am_missing_run}$2"}
-+AC_SUBST($1)])
- 
--dnl From libtool-1.4. Sets the variable LD.
--AC_DEFUN([AC_LIB_PROG_LD],
--[AC_ARG_WITH(gnu-ld,
--[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
--test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
--AC_REQUIRE([AC_PROG_CC])dnl
--AC_REQUIRE([AC_CANONICAL_HOST])dnl
--ac_prog=ld
--if test "$GCC" = yes; then
--  # Check if gcc -print-prog-name=ld gives a path.
--  AC_MSG_CHECKING([for ld used by GCC])
--  case $host in
--  *-*-mingw*)
--    # gcc leaves a trailing carriage return which upsets mingw
--    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
--  *)
--    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
--  esac
--  case $ac_prog in
--    # Accept absolute paths.
--    [[\\/]* | [A-Za-z]:[\\/]*)]
--      [re_direlt='/[^/][^/]*/\.\./']
--      # Canonicalize the path of ld
--      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
--      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
--	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
--      done
--      test -z "$LD" && LD="$ac_prog"
--      ;;
--  "")
--    # If it fails, then pretend we aren't using GCC.
--    ac_prog=ld
--    ;;
--  *)
--    # If it is relative, then search for the first ld in PATH.
--    with_gnu_ld=unknown
--    ;;
--  esac
--elif test "$with_gnu_ld" = yes; then
--  AC_MSG_CHECKING([for GNU ld])
--else
--  AC_MSG_CHECKING([for non-GNU ld])
--fi
--AC_CACHE_VAL(acl_cv_path_LD,
--[if test -z "$LD"; then
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
--  for ac_dir in $PATH; do
--    test -z "$ac_dir" && ac_dir=.
--    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
--      acl_cv_path_LD="$ac_dir/$ac_prog"
--      # Check to see if the program is GNU ld.  I'd rather use --version,
--      # but apparently some GNU ld's only accept -v.
--      # Break only if it was the GNU/non-GNU ld that we prefer.
--      if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
--	test "$with_gnu_ld" != no && break
--      else
--	test "$with_gnu_ld" != yes && break
--      fi
--    fi
--  done
--  IFS="$ac_save_ifs"
--else
--  acl_cv_path_LD="$LD" # Let the user override the test with a path.
--fi])
--LD="$acl_cv_path_LD"
--if test -n "$LD"; then
--  AC_MSG_RESULT($LD)
-+
-+# AM_MISSING_HAS_RUN
-+# ------------------
-+# Define MISSING if not defined so far and test if it supports --run.
-+# If it does, set am_missing_run to use it, otherwise, to nothing.
-+AC_DEFUN([AM_MISSING_HAS_RUN],
-+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-+# Use eval to expand $SHELL
-+if eval "$MISSING --run true"; then
-+  am_missing_run="$MISSING --run "
- else
--  AC_MSG_RESULT(no)
-+  am_missing_run=
-+  AC_MSG_WARN([`missing' script is too old or missing])
- fi
--test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
--AC_LIB_PROG_LD_GNU
- ])
- 
--# iconv.m4 serial AM4 (gettext-0.11.3)
--dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
--dnl This file is free software, distributed under the terms of the GNU
--dnl General Public License.  As a special exception to the GNU General
--dnl Public License, this file may be distributed as part of a program
--dnl that contains a configuration script generated by Autoconf, under
--dnl the same distribution terms as the rest of that program.
--
--dnl From Bruno Haible.
--
--AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
--[
--  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
--  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
--  AC_REQUIRE([AC_LIB_RPATH])
--
--  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
--  dnl accordingly.
--  AC_LIB_LINKFLAGS_BODY([iconv])
--])
-+# AM_PROG_MKDIR_P
-+# ---------------
-+# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
- 
--AC_DEFUN([AM_ICONV_LINK],
--[
--  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
--  dnl those with the standalone portable GNU libiconv installed).
--
--  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
--  dnl accordingly.
--  AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
--
--  dnl Add $INCICONV to CPPFLAGS before performing the following checks,
--  dnl because if the user has installed libiconv and not disabled its use
--  dnl via --without-libiconv-prefix, he wants to use it. The first
--  dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
--  am_save_CPPFLAGS="$CPPFLAGS"
--  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
--
--  AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
--    am_cv_func_iconv="no, consider installing GNU libiconv"
--    am_cv_lib_iconv=no
--    AC_TRY_LINK([#include <stdlib.h>
--#include <iconv.h>],
--      [iconv_t cd = iconv_open("","");
--       iconv(cd,NULL,NULL,NULL,NULL);
--       iconv_close(cd);],
--      am_cv_func_iconv=yes)
--    if test "$am_cv_func_iconv" != yes; then
--      am_save_LIBS="$LIBS"
--      LIBS="$LIBS $LIBICONV"
--      AC_TRY_LINK([#include <stdlib.h>
--#include <iconv.h>],
--        [iconv_t cd = iconv_open("","");
--         iconv(cd,NULL,NULL,NULL,NULL);
--         iconv_close(cd);],
--        am_cv_lib_iconv=yes
--        am_cv_func_iconv=yes)
--      LIBS="$am_save_LIBS"
--    fi
--  ])
--  if test "$am_cv_func_iconv" = yes; then
--    AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
--  fi
--  if test "$am_cv_lib_iconv" = yes; then
--    AC_MSG_CHECKING([how to link with libiconv])
--    AC_MSG_RESULT([$LIBICONV])
--  else
--    dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
--    dnl either.
--    CPPFLAGS="$am_save_CPPFLAGS"
--    LIBICONV=
--    LTLIBICONV=
--  fi
--  AC_SUBST(LIBICONV)
--  AC_SUBST(LTLIBICONV)
--])
-+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
- 
--AC_DEFUN([AM_ICONV],
--[
--  AM_ICONV_LINK
--  if test "$am_cv_func_iconv" = yes; then
--    AC_MSG_CHECKING([for iconv declaration])
--    AC_CACHE_VAL(am_cv_proto_iconv, [
--      AC_TRY_COMPILE([
--#include <stdlib.h>
--#include <iconv.h>
--extern
--#ifdef __cplusplus
--"C"
--#endif
--#if defined(__STDC__) || defined(__cplusplus)
--size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
--#else
--size_t iconv();
--#endif
--], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
--      am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
--    am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
--    AC_MSG_RESULT([$]{ac_t:-
--         }[$]am_cv_proto_iconv)
--    AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
--      [Define as const if the declaration of iconv() needs const.])
--  fi
--])
-+# 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
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
- 
--# progtest.m4 serial 2 (gettext-0.10.40)
--dnl Copyright (C) 1996-2002 Free Software Foundation, Inc.
--dnl This file is free software, distributed under the terms of the GNU
--dnl General Public License.  As a special exception to the GNU General
--dnl Public License, this file may be distributed as part of a program
--dnl that contains a configuration script generated by Autoconf, under
--dnl the same distribution terms as the rest of that program.
--dnl
--dnl This file can can be used in projects which are not available under
--dnl the GNU General Public License or the GNU Library General Public
--dnl License but which still want to provide support for the GNU gettext
--dnl functionality.
--dnl Please note that the actual code of the GNU gettext library is covered
--dnl by the GNU Library General Public License, and the rest of the GNU
--dnl gettext package package is covered by the GNU General Public License.
--dnl They are *not* in the public domain.
--
--dnl Authors:
--dnl   Ulrich Drepper <drepper at cygnus.com>, 1996.
--
--# Search path for a program which passes the given test.
--
--dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
--dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
--AC_DEFUN([AM_PATH_PROG_WITH_TEST],
--[# Extract the first word of "$2", so it can be a program name with args.
--set dummy $2; ac_word=[$]2
--AC_MSG_CHECKING([for $ac_word])
--AC_CACHE_VAL(ac_cv_path_$1,
--[case "[$]$1" in
--  /*)
--  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
--  ;;
--  *)
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
--  for ac_dir in ifelse([$5], , $PATH, [$5]); do
--    test -z "$ac_dir" && ac_dir=.
--    if test -f $ac_dir/$ac_word; then
--      if [$3]; then
--	ac_cv_path_$1="$ac_dir/$ac_word"
--	break
--      fi
--    fi
--  done
--  IFS="$ac_save_ifs"
--dnl If no 4th arg is given, leave the cache variable unset,
--dnl so AC_PATH_PROGS will keep looking.
--ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
--])dnl
--  ;;
--esac])dnl
--$1="$ac_cv_path_$1"
--if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
--  AC_MSG_RESULT([$]$1)
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
-+
-+# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
-+# created by `make install' are always world readable, even if the
-+# installer happens to have an overly restrictive umask (e.g. 077).
-+# This was a mistake.  There are at least two reasons why we must not
-+# use `-m 0755':
-+#   - it causes special bits like SGID to be ignored,
-+#   - it may be too restrictive (some setups expect 775 directories).
-+#
-+# Do not use -m 0755 and let people choose whatever they expect by
-+# setting umask.
-+#
-+# We cannot accept any implementation of `mkdir' that recognizes `-p'.
-+# Some implementations (such as Solaris 8's) are not thread-safe: if a
-+# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
-+# concurrently, both version can detect that a/ is missing, but only
-+# one can create it and the other will error out.  Consequently we
-+# restrict ourselves to GNU make (using the --version option ensures
-+# this.)
-+AC_DEFUN([AM_PROG_MKDIR_P],
-+[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-+  # Keeping the `.' argument allows $(mkdir_p) to be used without
-+  # argument.  Indeed, we sometimes output rules like
-+  #   $(mkdir_p) $(somedir)
-+  # where $(somedir) is conditionally defined.
-+  # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more
-+  # expensive solution, as it forces Make to start a sub-shell.)
-+  mkdir_p='mkdir -p -- .'
- else
--  AC_MSG_RESULT(no)
-+  # On NextStep and OpenStep, the `mkdir' command does not
-+  # recognize any option.  It will interpret all options as
-+  # directories to create, and then abort because `.' already
-+  # exists.
-+  for d in ./-p ./--version;
-+  do
-+    test -d $d && rmdir $d
-+  done
-+  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-+  if test -f "$ac_aux_dir/mkinstalldirs"; then
-+    mkdir_p='$(mkinstalldirs)'
-+  else
-+    mkdir_p='$(install_sh) -d'
-+  fi
- fi
--AC_SUBST($1)dnl
--])
--
--# isc-posix.m4 serial 2 (gettext-0.11.2)
--dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
--dnl This file is free software, distributed under the terms of the GNU
--dnl General Public License.  As a special exception to the GNU General
--dnl Public License, this file may be distributed as part of a program
--dnl that contains a configuration script generated by Autoconf, under
--dnl the same distribution terms as the rest of that program.
--
--# This file is not needed with autoconf-2.53 and newer.  Remove it in 2005.
--
--# This test replaces the one in autoconf.
--# Currently this macro should have the same name as the autoconf macro
--# because gettext's gettext.m4 (distributed in the automake package)
--# still uses it.  Otherwise, the use in gettext.m4 makes autoheader
--# give these diagnostics:
--#   configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX
--#   configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX
--
--undefine([AC_ISC_POSIX])
--
--AC_DEFUN([AC_ISC_POSIX],
--  [
--    dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
--    AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
--  ]
--)
-+AC_SUBST([mkdir_p])])
- 
--# glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40)
--dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
--dnl This file is free software, distributed under the terms of the GNU
--dnl General Public License.  As a special exception to the GNU General
--dnl Public License, this file may be distributed as part of a program
--dnl that contains a configuration script generated by Autoconf, under
--dnl the same distribution terms as the rest of that program.
--
--# Test for the GNU C Library, version 2.1 or newer.
--# From Bruno Haible.
--
--AC_DEFUN([jm_GLIBC21],
--  [
--    AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
--      ac_cv_gnu_library_2_1,
--      [AC_EGREP_CPP([Lucky GNU user],
--	[
--#include <features.h>
--#ifdef __GNU_LIBRARY__
-- #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
--  Lucky GNU user
-- #endif
--#endif
--	],
--	ac_cv_gnu_library_2_1=yes,
--	ac_cv_gnu_library_2_1=no)
--      ]
--    )
--    AC_SUBST(GLIBC21)
--    GLIBC21="$ac_cv_gnu_library_2_1"
--  ]
--)
-+# Helper functions for option handling.                    -*- Autoconf -*-
- 
--# intdiv0.m4 serial 1 (gettext-0.11.3)
--dnl Copyright (C) 2002 Free Software Foundation, Inc.
--dnl This file is free software, distributed under the terms of the GNU
--dnl General Public License.  As a special exception to the GNU General
--dnl Public License, this file may be distributed as part of a program
--dnl that contains a configuration script generated by Autoconf, under
--dnl the same distribution terms as the rest of that program.
--
--dnl From Bruno Haible.
--
--AC_DEFUN([gt_INTDIV0],
--[
--  AC_REQUIRE([AC_PROG_CC])dnl
--  AC_REQUIRE([AC_CANONICAL_HOST])dnl
--
--  AC_CACHE_CHECK([whether integer division by zero raises SIGFPE],
--    gt_cv_int_divbyzero_sigfpe,
--    [
--      AC_TRY_RUN([
--#include <stdlib.h>
--#include <signal.h>
--
--static void
--#ifdef __cplusplus
--sigfpe_handler (int sig)
--#else
--sigfpe_handler (sig) int sig;
--#endif
--{
--  /* Exit with code 0 if SIGFPE, with code 1 if any other signal.  */
--  exit (sig != SIGFPE);
--}
--
--int x = 1;
--int y = 0;
--int z;
--int nan;
--
--int main ()
--{
--  signal (SIGFPE, sigfpe_handler);
--/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP.  */
--#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP)
--  signal (SIGTRAP, sigfpe_handler);
--#endif
--/* Linux/SPARC yields signal SIGILL.  */
--#if defined (__sparc__) && defined (__linux__)
--  signal (SIGILL, sigfpe_handler);
--#endif
--
--  z = x / y;
--  nan = y / y;
--  exit (1);
--}
--], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no,
--        [
--          # Guess based on the CPU.
--          case "$host_cpu" in
--            alpha* | i[34567]86 | m68k | s390*)
--              gt_cv_int_divbyzero_sigfpe="guessing yes";;
--            *)
--              gt_cv_int_divbyzero_sigfpe="guessing no";;
--          esac
--        ])
--    ])
--  case "$gt_cv_int_divbyzero_sigfpe" in
--    *yes) value=1;;
--    *) value=0;;
--  esac
--  AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value,
--    [Define if integer division by zero raises signal SIGFPE.])
--])
-+# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
- 
--# uintmax_t.m4 serial 6 (gettext-0.11)
--dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
--dnl This file is free software, distributed under the terms of the GNU
--dnl General Public License.  As a special exception to the GNU General
--dnl Public License, this file may be distributed as part of a program
--dnl that contains a configuration script generated by Autoconf, under
--dnl the same distribution terms as the rest of that program.
--
--dnl From Paul Eggert.
--
--AC_PREREQ(2.13)
--
--# Define uintmax_t to `unsigned long' or `unsigned long long'
--# if <inttypes.h> does not exist.
--
--AC_DEFUN([jm_AC_TYPE_UINTMAX_T],
--[
--  AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
--  AC_REQUIRE([jm_AC_HEADER_STDINT_H])
--  if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then
--    AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG])
--    test $ac_cv_type_unsigned_long_long = yes \
--      && ac_type='unsigned long long' \
--      || ac_type='unsigned long'
--    AC_DEFINE_UNQUOTED(uintmax_t, $ac_type,
--  [Define to unsigned long or unsigned long long
--   if <inttypes.h> and <stdint.h> don't define.])
--  fi
--])
-+# 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
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
- 
--# inttypes_h.m4 serial 4 (gettext-0.11.4)
--dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
--dnl This file is free software, distributed under the terms of the GNU
--dnl General Public License.  As a special exception to the GNU General
--dnl Public License, this file may be distributed as part of a program
--dnl that contains a configuration script generated by Autoconf, under
--dnl the same distribution terms as the rest of that program.
--
--dnl From Paul Eggert.
--
--# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists,
--# doesn't clash with <sys/types.h>, and declares uintmax_t.
--
--AC_DEFUN([jm_AC_HEADER_INTTYPES_H],
--[
--  AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h,
--  [AC_TRY_COMPILE(
--    [#include <sys/types.h>
--#include <inttypes.h>],
--    [uintmax_t i = (uintmax_t) -1;],
--    jm_ac_cv_header_inttypes_h=yes,
--    jm_ac_cv_header_inttypes_h=no)])
--  if test $jm_ac_cv_header_inttypes_h = yes; then
--    AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1,
--[Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
--   and declares uintmax_t. ])
--  fi
--])
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
- 
--# stdint_h.m4 serial 2 (gettext-0.11.4)
--dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
--dnl This file is free software, distributed under the terms of the GNU
--dnl General Public License.  As a special exception to the GNU General
--dnl Public License, this file may be distributed as part of a program
--dnl that contains a configuration script generated by Autoconf, under
--dnl the same distribution terms as the rest of that program.
--
--dnl From Paul Eggert.
--
--# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists,
--# doesn't clash with <sys/types.h>, and declares uintmax_t.
--
--AC_DEFUN([jm_AC_HEADER_STDINT_H],
--[
--  AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h,
--  [AC_TRY_COMPILE(
--    [#include <sys/types.h>
--#include <stdint.h>],
--    [uintmax_t i = (uintmax_t) -1;],
--    jm_ac_cv_header_stdint_h=yes,
--    jm_ac_cv_header_stdint_h=no)])
--  if test $jm_ac_cv_header_stdint_h = yes; then
--    AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1,
--[Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
--   and declares uintmax_t. ])
--  fi
--])
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
- 
--# ulonglong.m4 serial 2 (fileutils-4.0.32, gettext-0.10.40)
--dnl Copyright (C) 1999-2002 Free Software Foundation, Inc.
--dnl This file is free software, distributed under the terms of the GNU
--dnl General Public License.  As a special exception to the GNU General
--dnl Public License, this file may be distributed as part of a program
--dnl that contains a configuration script generated by Autoconf, under
--dnl the same distribution terms as the rest of that program.
--
--dnl From Paul Eggert.
--
--AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG],
--[
--  AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long,
--  [AC_TRY_LINK([unsigned long long ull = 1; int i = 63;],
--    [unsigned long long ullmax = (unsigned long long) -1;
--     return ull << i | ull >> i | ullmax / ull | ullmax % ull;],
--    ac_cv_type_unsigned_long_long=yes,
--    ac_cv_type_unsigned_long_long=no)])
--  if test $ac_cv_type_unsigned_long_long = yes; then
--    AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1,
--      [Define if you have the unsigned long long type.])
--  fi
--])
-+# serial 2
- 
--# inttypes.m4 serial 1 (gettext-0.11.4)
--dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
--dnl This file is free software, distributed under the terms of the GNU
--dnl General Public License.  As a special exception to the GNU General
--dnl Public License, this file may be distributed as part of a program
--dnl that contains a configuration script generated by Autoconf, under
--dnl the same distribution terms as the rest of that program.
--
--dnl From Paul Eggert.
--
--# Define HAVE_INTTYPES_H if <inttypes.h> exists and doesn't clash with
--# <sys/types.h>.
--
--AC_DEFUN([gt_HEADER_INTTYPES_H],
--[
--  AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h,
--  [
--    AC_TRY_COMPILE(
--      [#include <sys/types.h>
--#include <inttypes.h>],
--      [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no)
--  ])
--  if test $gt_cv_header_inttypes_h = yes; then
--    AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1,
--      [Define if <inttypes.h> exists and doesn't clash with <sys/types.h>.])
--  fi
--])
-+# _AM_MANGLE_OPTION(NAME)
-+# -----------------------
-+AC_DEFUN([_AM_MANGLE_OPTION],
-+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
- 
--# inttypes-pri.m4 serial 1 (gettext-0.11.4)
--dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
--dnl This file is free software, distributed under the terms of the GNU
--dnl General Public License.  As a special exception to the GNU General
--dnl Public License, this file may be distributed as part of a program
--dnl that contains a configuration script generated by Autoconf, under
--dnl the same distribution terms as the rest of that program.
--
--dnl From Bruno Haible.
--
--# Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI*
--# macros to non-string values.  This is the case on AIX 4.3.3.
--
--AC_DEFUN([gt_INTTYPES_PRI],
--[
--  AC_REQUIRE([gt_HEADER_INTTYPES_H])
--  if test $gt_cv_header_inttypes_h = yes; then
--    AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
--      gt_cv_inttypes_pri_broken,
--      [
--        AC_TRY_COMPILE([#include <inttypes.h>
--#ifdef PRId32
--char *p = PRId32;
--#endif
--], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes)
--      ])
--  fi
--  if test "$gt_cv_inttypes_pri_broken" = yes; then
--    AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1,
--      [Define if <inttypes.h> exists and defines unusable PRI* macros.])
--  fi
--])
-+# _AM_SET_OPTION(NAME)
-+# ------------------------------
-+# Set option NAME.  Presently that only means defining a flag for this option.
-+AC_DEFUN([_AM_SET_OPTION],
-+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
- 
--# codeset.m4 serial AM1 (gettext-0.10.40)
--dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
--dnl This file is free software, distributed under the terms of the GNU
--dnl General Public License.  As a special exception to the GNU General
--dnl Public License, this file may be distributed as part of a program
--dnl that contains a configuration script generated by Autoconf, under
--dnl the same distribution terms as the rest of that program.
--
--dnl From Bruno Haible.
--
--AC_DEFUN([AM_LANGINFO_CODESET],
--[
--  AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
--    [AC_TRY_LINK([#include <langinfo.h>],
--      [char* cs = nl_langinfo(CODESET);],
--      am_cv_langinfo_codeset=yes,
--      am_cv_langinfo_codeset=no)
--    ])
--  if test $am_cv_langinfo_codeset = yes; then
--    AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
--      [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
--  fi
--])
-+# _AM_SET_OPTIONS(OPTIONS)
-+# ----------------------------------
-+# OPTIONS is a space-separated list of Automake options.
-+AC_DEFUN([_AM_SET_OPTIONS],
-+[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
- 
--# lcmessage.m4 serial 3 (gettext-0.11.3)
--dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
--dnl This file is free software, distributed under the terms of the GNU
--dnl General Public License.  As a special exception to the GNU General
--dnl Public License, this file may be distributed as part of a program
--dnl that contains a configuration script generated by Autoconf, under
--dnl the same distribution terms as the rest of that program.
--dnl
--dnl This file can can be used in projects which are not available under
--dnl the GNU General Public License or the GNU Library General Public
--dnl License but which still want to provide support for the GNU gettext
--dnl functionality.
--dnl Please note that the actual code of the GNU gettext library is covered
--dnl by the GNU Library General Public License, and the rest of the GNU
--dnl gettext package package is covered by the GNU General Public License.
--dnl They are *not* in the public domain.
--
--dnl Authors:
--dnl   Ulrich Drepper <drepper at cygnus.com>, 1995.
--
--# Check whether LC_MESSAGES is available in <locale.h>.
--
--AC_DEFUN([AM_LC_MESSAGES],
--[
--  AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
--    [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
--       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
--  if test $am_cv_val_LC_MESSAGES = yes; then
--    AC_DEFINE(HAVE_LC_MESSAGES, 1,
--      [Define if your <locale.h> file defines LC_MESSAGES.])
--  fi
--])
-+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-+# -------------------------------------------
-+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-+AC_DEFUN([_AM_IF_OPTION],
-+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
- 
-+#
-+# Check to make sure that the build environment is sane.
-+#
- 
--# Copyright 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
-+# Copyright (C) 1996, 1997, 2000, 2001, 2003 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
-@@ -2720,16 +899,89 @@
- 
- # serial 3
- 
--AC_PREREQ(2.50)
-+# AM_SANITY_CHECK
-+# ---------------
-+AC_DEFUN([AM_SANITY_CHECK],
-+[AC_MSG_CHECKING([whether build environment is sane])
-+# Just in case
-+sleep 1
-+echo timestamp > conftest.file
-+# Do `set' in a subshell so we don't clobber the current shell's
-+# arguments.  Must try -L first in case configure is actually a
-+# symlink; some systems play weird games with the mod time of symlinks
-+# (eg FreeBSD returns the mod time of the symlink's containing
-+# directory).
-+if (
-+   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-+   if test "$[*]" = "X"; then
-+      # -L didn't work.
-+      set X `ls -t $srcdir/configure conftest.file`
-+   fi
-+   rm -f conftest.file
-+   if test "$[*]" != "X $srcdir/configure conftest.file" \
-+      && test "$[*]" != "X conftest.file $srcdir/configure"; then
- 
--# AM_PROG_LEX
--# -----------
--# Autoconf leaves LEX=: if lex or flex can't be found.  Change that to a
--# "missing" invocation, for better error output.
--AC_DEFUN([AM_PROG_LEX],
--[AC_REQUIRE([AM_MISSING_HAS_RUN])dnl
--AC_REQUIRE([AC_PROG_LEX])dnl
--if test "$LEX" = :; then
--  LEX=${am_missing_run}flex
--fi])
-+      # If neither matched, then we have a broken ls.  This can happen
-+      # if, for instance, CONFIG_SHELL is bash and it inherits a
-+      # broken ls alias from the environment.  This has actually
-+      # happened.  Such a system could not be considered "sane".
-+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-+alias in your environment])
-+   fi
-+
-+   test "$[2]" = conftest.file
-+   )
-+then
-+   # Ok.
-+   :
-+else
-+   AC_MSG_ERROR([newly created file is older than distributed files!
-+Check your system clock])
-+fi
-+AC_MSG_RESULT(yes)])
-+
-+# AM_PROG_INSTALL_STRIP
-+
-+# Copyright (C) 2001, 2003 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
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
-+
-+# One issue with vendor `install' (even GNU) is that you can't
-+# specify the program used to strip binaries.  This is especially
-+# annoying in cross-compiling environments, where the build's strip
-+# is unlikely to handle the host's binaries.
-+# Fortunately install-sh will honor a STRIPPROG variable, so we
-+# always use install-sh in `make install-strip', and initialize
-+# STRIPPROG with the value of the STRIP variable (set by the user).
-+AC_DEFUN([AM_PROG_INSTALL_STRIP],
-+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-+# Installed binaries are usually stripped using `strip' when the user
-+# run `make install-strip'.  However `strip' might not be the right
-+# tool to use in cross-compilation environments, therefore Automake
-+# will honor the `STRIP' environment variable to overrule this program.
-+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-+if test "$cross_compiling" != no; then
-+  AC_CHECK_TOOL([STRIP], [strip], :)
-+fi
-+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-+AC_SUBST([INSTALL_STRIP_PROGRAM])])
- 
-+m4_include([m4/gettext.m4])
-+m4_include([m4/iconv.m4])
-+m4_include([m4/lib-ld.m4])
-+m4_include([m4/lib-link.m4])
-+m4_include([m4/lib-prefix.m4])
-+m4_include([m4/progtest.m4])
-diff -Naur flex-2.5.31.orig/config.guess flex-2.5.31/config.guess
---- flex-2.5.31.orig/config.guess	2003-04-01 16:32:34.000000000 +0000
-+++ flex-2.5.31/config.guess	2005-01-08 07:43:01.380971176 +0000
-@@ -1,9 +1,9 @@
- #! /bin/sh
- # Attempt to guess a canonical system name.
- #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--#   2000, 2001, 2002 Free Software Foundation, Inc.
-+#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
- 
--timestamp='2002-09-03'
-+timestamp='2003-07-02'
- 
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
-@@ -98,30 +98,32 @@
- # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
- # use `HOST_CC' if defined, but it is deprecated.
- 
--# This shell variable is my proudest work .. or something. --bje
-+# Portable tmp directory creation inspired by the Autoconf team.
- 
--set_cc_for_build='tmpdir=${TMPDIR-/tmp}/config-guess-$$ ;
--(old=`umask` && umask 077 && mkdir $tmpdir && umask $old && unset old)
--   || (echo "$me: cannot create $tmpdir" >&2 && exit 1) ;
--dummy=$tmpdir/dummy ;
--files="$dummy.c $dummy.o $dummy.rel $dummy" ;
--trap '"'"'rm -f $files; rmdir $tmpdir; exit 1'"'"' 1 2 15 ;
-+set_cc_for_build='
-+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-+: ${TMPDIR=/tmp} ;
-+ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
-+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
-+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
-+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-+dummy=$tmp/dummy ;
-+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
- case $CC_FOR_BUILD,$HOST_CC,$CC in
-  ,,)    echo "int x;" > $dummy.c ;
- 	for c in cc gcc c89 c99 ; do
--	  if ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ; then
-+	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
- 	     CC_FOR_BUILD="$c"; break ;
- 	  fi ;
- 	done ;
--	rm -f $files ;
- 	if test x"$CC_FOR_BUILD" = x ; then
- 	  CC_FOR_BUILD=no_compiler_found ;
- 	fi
- 	;;
-  ,,*)   CC_FOR_BUILD=$CC ;;
-  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
--esac ;
--unset files'
-+esac ;'
- 
- # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
- # (ghazi at noc.rutgers.edu 1994-08-24)
-@@ -178,7 +180,18 @@
- 		;;
- 	esac
- 	# The OS release
-+	# Debian GNU/NetBSD machines have a different userland, and
-+	# thus, need a distinct triplet. However, they do not need
-+	# kernel version information, so it can be replaced with a
-+	# suitable tag, in the style of linux-gnu.
-+	case "${UNAME_VERSION}" in
-+	    Debian*)
-+		release='-gnu'
-+		;;
-+	    *)
- 	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-+		;;
-+	esac
- 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
- 	# contains redundant information, the shorter form:
- 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-@@ -227,68 +240,52 @@
- 	if test $UNAME_RELEASE = "V4.0"; then
- 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
- 	fi
-+	# According to Compaq, /usr/sbin/psrinfo has been available on
-+	# OSF/1 and Tru64 systems produced since 1995.  I hope that
-+	# covers most systems running today.  This code pipes the CPU
-+	# types through head -n 1, so we only detect the type of CPU 0.
-+	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-+	case "$ALPHA_CPU_TYPE" in
-+	    "EV4 (21064)")
-+		UNAME_MACHINE="alpha" ;;
-+	    "EV4.5 (21064)")
-+		UNAME_MACHINE="alpha" ;;
-+	    "LCA4 (21066/21068)")
-+		UNAME_MACHINE="alpha" ;;
-+	    "EV5 (21164)")
-+		UNAME_MACHINE="alphaev5" ;;
-+	    "EV5.6 (21164A)")
-+		UNAME_MACHINE="alphaev56" ;;
-+	    "EV5.6 (21164PC)")
-+		UNAME_MACHINE="alphapca56" ;;
-+	    "EV5.7 (21164PC)")
-+		UNAME_MACHINE="alphapca57" ;;
-+	    "EV6 (21264)")
-+		UNAME_MACHINE="alphaev6" ;;
-+	    "EV6.7 (21264A)")
-+		UNAME_MACHINE="alphaev67" ;;
-+	    "EV6.8CB (21264C)")
-+		UNAME_MACHINE="alphaev68" ;;
-+	    "EV6.8AL (21264B)")
-+		UNAME_MACHINE="alphaev68" ;;
-+	    "EV6.8CX (21264D)")
-+		UNAME_MACHINE="alphaev68" ;;
-+	    "EV6.9A (21264/EV69A)")
-+		UNAME_MACHINE="alphaev69" ;;
-+	    "EV7 (21364)")
-+		UNAME_MACHINE="alphaev7" ;;
-+	    "EV7.9 (21364A)")
-+		UNAME_MACHINE="alphaev79" ;;
-+	esac
- 	# A Vn.n version is a released version.
- 	# A Tn.n version is a released field test version.
- 	# A Xn.n version is an unreleased experimental baselevel.
- 	# 1.2 uses "1.2" for uname -r.
--	eval $set_cc_for_build
--	cat <<EOF >$dummy.s
--	.data
--\$Lformat:
--	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
--
--	.text
--	.globl main
--	.align 4
--	.ent main
--main:
--	.frame \$30,16,\$26,0
--	ldgp \$29,0(\$27)
--	.prologue 1
--	.long 0x47e03d80 # implver \$0
--	lda \$2,-1
--	.long 0x47e20c21 # amask \$2,\$1
--	lda \$16,\$Lformat
--	mov \$0,\$17
--	not \$1,\$18
--	jsr \$26,printf
--	ldgp \$29,0(\$26)
--	mov 0,\$16
--	jsr \$26,exit
--	.end main
--EOF
--	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
--	if test "$?" = 0 ; then
--		case `$dummy` in
--			0-0)
--				UNAME_MACHINE="alpha"
--				;;
--			1-0)
--				UNAME_MACHINE="alphaev5"
--				;;
--			1-1)
--				UNAME_MACHINE="alphaev56"
--				;;
--			1-101)
--				UNAME_MACHINE="alphapca56"
--				;;
--			2-303)
--				UNAME_MACHINE="alphaev6"
--				;;
--			2-307)
--				UNAME_MACHINE="alphaev67"
--				;;
--			2-1307)
--				UNAME_MACHINE="alphaev68"
--				;;
--			3-1307)
--				UNAME_MACHINE="alphaev7"
--				;;
--		esac
--	fi
--	rm -f $dummy.s $dummy && rmdir $tmpdir
- 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- 	exit 0 ;;
-+    Alpha*:OpenVMS:*:*)
-+	echo alpha-hp-vms
-+	exit 0 ;;
-     Alpha\ *:Windows_NT*:*)
- 	# How do we know it's Interix rather than the generic POSIX subsystem?
- 	# Should we change UNAME_MACHINE based on the output of uname instead
-@@ -327,6 +324,9 @@
-     NILE*:*:*:dcosx)
- 	echo pyramid-pyramid-svr4
- 	exit 0 ;;
-+    DRS?6000:unix:4.0:6*)
-+	echo sparc-icl-nx6
-+	exit 0 ;;
-     DRS?6000:UNIX_SV:4.2*:7*)
- 	case `/usr/bin/uname -p` in
- 	    sparc) echo sparc-icl-nx7 && exit 0 ;;
-@@ -437,10 +437,9 @@
- 	  exit (-1);
- 	}
- EOF
--	$CC_FOR_BUILD $dummy.c -o $dummy \
-+	$CC_FOR_BUILD -o $dummy $dummy.c \
- 	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
--	  && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
--	rm -f $dummy.c $dummy && rmdir $tmpdir
-+	  && exit 0
- 	echo mips-mips-riscos${UNAME_RELEASE}
- 	exit 0 ;;
-     Motorola:PowerMAX_OS:*:*)
-@@ -449,7 +448,7 @@
-     Motorola:*:4.3:PL8-*)
- 	echo powerpc-harris-powermax
- 	exit 0 ;;
--    Night_Hawk:*:*:PowerMAX_OS)
-+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
- 	echo powerpc-harris-powermax
- 	exit 0 ;;
-     Night_Hawk:Power_UNIX:*:*)
-@@ -524,8 +523,7 @@
- 			exit(0);
- 			}
- EOF
--		$CC_FOR_BUILD $dummy.c -o $dummy && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
--		rm -f $dummy.c $dummy && rmdir $tmpdir
-+		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
- 		echo rs6000-ibm-aix3.2.5
- 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
- 		echo rs6000-ibm-aix3.2.4
-@@ -623,11 +621,21 @@
-                   exit (0);
-               }
- EOF
--		    (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`$dummy`
--		    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
--		    rm -f $dummy.c $dummy && rmdir $tmpdir
-+		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-+		    test -z "$HP_ARCH" && HP_ARCH=hppa
- 		fi ;;
- 	esac
-+	if [ ${HP_ARCH} = "hppa2.0w" ]
-+	then
-+	    # avoid double evaluation of $set_cc_for_build
-+	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
-+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
-+	    then
-+		HP_ARCH="hppa2.0w"
-+	    else
-+		HP_ARCH="hppa64"
-+	    fi
-+	fi
- 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
- 	exit 0 ;;
-     ia64:HP-UX:*:*)
-@@ -661,8 +669,7 @@
- 	  exit (0);
- 	}
- EOF
--	$CC_FOR_BUILD $dummy.c -o $dummy && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
--	rm -f $dummy.c $dummy && rmdir $tmpdir
-+	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
- 	echo unknown-hitachi-hiuxwe2
- 	exit 0 ;;
-     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-@@ -720,15 +727,15 @@
-     CRAY*TS:*:*:*)
- 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- 	exit 0 ;;
--    CRAY*T3D:*:*:*)
--	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
-     CRAY*T3E:*:*:*)
- 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- 	exit 0 ;;
-     CRAY*SV1:*:*:*)
- 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- 	exit 0 ;;
-+    *:UNICOS/mp:*:*)
-+	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 
-+	exit 0 ;;
-     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
- 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-@@ -744,7 +751,7 @@
-     *:BSD/OS:*:*)
- 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
- 	exit 0 ;;
--    *:FreeBSD:*:*)
-+    *:FreeBSD:*:*|*:GNU/FreeBSD:*:*)
- 	# Determine whether the default compiler uses glibc.
- 	eval $set_cc_for_build
- 	sed 's/^	//' << EOF >$dummy.c
-@@ -756,8 +763,10 @@
- 	#endif
- EOF
- 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
--	rm -f $dummy.c && rmdir $tmpdir
--	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
-+	# GNU/FreeBSD systems have a "k" prefix to indicate we are using
-+	# FreeBSD's kernel, but not the complete OS.
-+	case ${LIBC} in gnu) kernel_only='k' ;; esac
-+	echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
- 	exit 0 ;;
-     i*:CYGWIN*:*)
- 	echo ${UNAME_MACHINE}-pc-cygwin
-@@ -768,14 +777,17 @@
-     i*:PW*:*)
- 	echo ${UNAME_MACHINE}-pc-pw32
- 	exit 0 ;;
--    x86:Interix*:3*)
--	echo i386-pc-interix3
-+    x86:Interix*:[34]*)
-+	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-+	exit 0 ;;
-+    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-+	echo i${UNAME_MACHINE}-pc-mks
- 	exit 0 ;;
-     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
- 	# How do we know it's Interix rather than the generic POSIX subsystem?
- 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
- 	# UNAME_MACHINE based on the output of uname instead of i386?
--	echo i386-pc-interix
-+	echo i586-pc-interix
- 	exit 0 ;;
-     i*:UWIN*:*)
- 	echo ${UNAME_MACHINE}-pc-uwin
-@@ -795,6 +807,9 @@
-     arm*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit 0 ;;
-+    cris:Linux:*:*)
-+	echo cris-axis-linux-gnu
-+	exit 0 ;;
-     ia64:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit 0 ;;
-@@ -818,8 +833,26 @@
- 	#endif
- EOF
- 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
--	rm -f $dummy.c && rmdir $tmpdir
--	test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0
-+	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
-+	;;
-+    mips64:Linux:*:*)
-+	eval $set_cc_for_build
-+	sed 's/^	//' << EOF >$dummy.c
-+	#undef CPU
-+	#undef mips64
-+	#undef mips64el
-+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-+	CPU=mips64el
-+	#else
-+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-+	CPU=mips64
-+	#else
-+	CPU=
-+	#endif
-+	#endif
-+EOF
-+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-+	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
- 	;;
-     ppc:Linux:*:*)
- 	echo powerpc-unknown-linux-gnu
-@@ -855,6 +888,9 @@
-     s390:Linux:*:* | s390x:Linux:*:*)
- 	echo ${UNAME_MACHINE}-ibm-linux
- 	exit 0 ;;
-+    sh64*:Linux:*:*)
-+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit 0 ;;
-     sh*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit 0 ;;
-@@ -914,7 +950,6 @@
- 	#endif
- EOF
- 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
--	rm -f $dummy.c && rmdir $tmpdir
- 	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
- 	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
- 	;;
-@@ -932,6 +967,23 @@
-         # Use sysv4.2uw... so that sysv4* matches it.
- 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
- 	exit 0 ;;
-+    i*86:OS/2:*:*)
-+	# If we were able to find `uname', then EMX Unix compatibility
-+	# is probably installed.
-+	echo ${UNAME_MACHINE}-pc-os2-emx
-+	exit 0 ;;
-+    i*86:XTS-300:*:STOP)
-+	echo ${UNAME_MACHINE}-unknown-stop
-+	exit 0 ;;
-+    i*86:atheos:*:*)
-+	echo ${UNAME_MACHINE}-unknown-atheos
-+	exit 0 ;;
-+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-+	echo i386-unknown-lynxos${UNAME_RELEASE}
-+	exit 0 ;;
-+    i*86:*DOS:*:*)
-+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-+	exit 0 ;;
-     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
- 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
- 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-@@ -966,9 +1018,6 @@
- 		echo ${UNAME_MACHINE}-pc-sysv32
- 	fi
- 	exit 0 ;;
--    i*86:*DOS:*:*)
--	echo ${UNAME_MACHINE}-pc-msdosdjgpp
--	exit 0 ;;
-     pc:*:*:*)
- 	# Left here for compatibility:
-         # uname -m prints for DJGPP always 'pc', but it prints nothing about
-@@ -995,9 +1044,12 @@
-     mc68k:UNIX:SYSTEM5:3.51m)
- 	echo m68k-convergent-sysv
- 	exit 0 ;;
-+    M680?0:D-NIX:5.3:*)
-+	echo m68k-diab-dnix
-+	exit 0 ;;
-     M68*:*:R3V[567]*:*)
- 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
--    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)
-+    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
- 	OS_REL=''
- 	test -r /etc/.relid \
- 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-@@ -1014,9 +1066,6 @@
-     mc68030:UNIX_System_V:4.*:*)
- 	echo m68k-atari-sysv4
- 	exit 0 ;;
--    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
--	echo i386-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
-     TSUNAMI:LynxOS:2.*:*)
- 	echo sparc-unknown-lynxos${UNAME_RELEASE}
- 	exit 0 ;;
-@@ -1098,7 +1147,11 @@
- 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
- 	exit 0 ;;
-     *:Darwin:*:*)
--	echo `uname -p`-apple-darwin${UNAME_RELEASE}
-+	case `uname -p` in
-+	    *86) UNAME_PROCESSOR=i686 ;;
-+	    powerpc) UNAME_PROCESSOR=powerpc ;;
-+	esac
-+	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
- 	exit 0 ;;
-     *:procnto*:*:* | *:QNX:[0123456789]*:*)
- 	UNAME_PROCESSOR=`uname -p`
-@@ -1134,11 +1187,6 @@
- 	fi
- 	echo ${UNAME_MACHINE}-unknown-plan9
- 	exit 0 ;;
--    i*86:OS/2:*:*)
--	# If we were able to find `uname', then EMX Unix compatibility
--	# is probably installed.
--	echo ${UNAME_MACHINE}-pc-os2-emx
--	exit 0 ;;
-     *:TOPS-10:*:*)
- 	echo pdp10-unknown-tops10
- 	exit 0 ;;
-@@ -1157,11 +1205,8 @@
-     *:ITS:*:*)
- 	echo pdp10-unknown-its
- 	exit 0 ;;
--    i*86:XTS-300:*:STOP)
--	echo ${UNAME_MACHINE}-unknown-stop
--	exit 0 ;;
--    i*86:atheos:*:*)
--	echo ${UNAME_MACHINE}-unknown-atheos
-+    SEI:*:*:SEIUX)
-+        echo mips-sei-seiux${UNAME_RELEASE}
- 	exit 0 ;;
- esac
- 
-@@ -1283,8 +1328,7 @@
- }
- EOF
- 
--$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
--rm -f $dummy.c $dummy && rmdir $tmpdir
-+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
- 
- # Apollos put the system type in the environment.
- 
-diff -Naur flex-2.5.31.orig/config.sub flex-2.5.31/config.sub
---- flex-2.5.31.orig/config.sub	2003-04-01 16:32:34.000000000 +0000
-+++ flex-2.5.31/config.sub	2005-01-08 07:43:01.390969656 +0000
-@@ -1,9 +1,9 @@
- #! /bin/sh
- # Configuration validation subroutine script.
- #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--#   2000, 2001, 2002 Free Software Foundation, Inc.
-+#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
- 
--timestamp='2002-09-05'
-+timestamp='2003-07-17'
- 
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
-@@ -118,7 +118,7 @@
- # Here we must recognize all the valid KERNEL-OS combinations.
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
--  nto-qnx* | linux-gnu* | freebsd*-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
-+  nto-qnx* | linux-gnu* | kfreebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
-     os=-$maybe_os
-     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-     ;;
-@@ -228,13 +228,14 @@
- 	| a29k \
- 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
- 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-+	| am33_2.0 \
- 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
--	| clipper \
-+	| c4x | clipper \
- 	| d10v | d30v | dlx | dsp16xx \
- 	| fr30 | frv \
- 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
- 	| i370 | i860 | i960 | ia64 \
--	| ip2k \
-+	| ip2k | iq2000 \
- 	| m32r | m68000 | m68k | m88k | mcore \
- 	| mips | mipsbe | mipseb | mipsel | mipsle \
- 	| mips16 \
-@@ -245,21 +246,23 @@
- 	| mips64vr4300 | mips64vr4300el \
- 	| mips64vr5000 | mips64vr5000el \
- 	| mipsisa32 | mipsisa32el \
-+	| mipsisa32r2 | mipsisa32r2el \
- 	| mipsisa64 | mipsisa64el \
- 	| mipsisa64sb1 | mipsisa64sb1el \
- 	| mipsisa64sr71k | mipsisa64sr71kel \
- 	| mipstx39 | mipstx39el \
- 	| mn10200 | mn10300 \
-+	| msp430 \
- 	| ns16k | ns32k \
- 	| openrisc | or32 \
- 	| pdp10 | pdp11 | pj | pjl \
- 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
- 	| pyramid \
--	| sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-+	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
- 	| sh64 | sh64le \
- 	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
- 	| strongarm \
--	| tahoe | thumb | tic80 | tron \
-+	| tahoe | thumb | tic4x | tic80 | tron \
- 	| v850 | v850e \
- 	| we32k \
- 	| x86 | xscale | xstormy16 | xtensa \
-@@ -294,7 +297,7 @@
- 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
- 	| avr-* \
- 	| bs2000-* \
--	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \
-+	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
- 	| clipper-* | cydra-* \
- 	| d10v-* | d30v-* | dlx-* \
- 	| elxsi-* \
-@@ -302,7 +305,7 @@
- 	| h8300-* | h8500-* \
- 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
- 	| i*86-* | i860-* | i960-* | ia64-* \
--	| ip2k-* \
-+	| ip2k-* | iq2000-* \
- 	| m32r-* \
- 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- 	| m88110-* | m88k-* | mcore-* \
-@@ -315,21 +318,25 @@
- 	| mips64vr4300-* | mips64vr4300el-* \
- 	| mips64vr5000-* | mips64vr5000el-* \
- 	| mipsisa32-* | mipsisa32el-* \
-+	| mipsisa32r2-* | mipsisa32r2el-* \
- 	| mipsisa64-* | mipsisa64el-* \
- 	| mipsisa64sb1-* | mipsisa64sb1el-* \
- 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
--	| mipstx39 | mipstx39el \
--	| none-* | np1-* | ns16k-* | ns32k-* \
-+	| mipstx39-* | mipstx39el-* \
-+	| msp430-* \
-+	| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
- 	| orion-* \
- 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
- 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
- 	| pyramid-* \
- 	| romp-* | rs6000-* \
--	| sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \
-+	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
- 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
- 	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
- 	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
--	| tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \
-+	| tahoe-* | thumb-* \
-+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-+	| tron-* \
- 	| v850-* | v850e-* | vax-* \
- 	| we32k-* \
- 	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
-@@ -367,6 +374,9 @@
- 		basic_machine=a29k-none
- 		os=-bsd
- 		;;
-+	amd64)
-+		basic_machine=x86_64-pc
-+		;;
- 	amdahl)
- 		basic_machine=580-amdahl
- 		os=-sysv
-@@ -716,6 +726,10 @@
- 	np1)
- 		basic_machine=np1-gould
- 		;;
-+	nv1)
-+		basic_machine=nv1-cray
-+		os=-unicosmp
-+		;;
- 	nsr-tandem)
- 		basic_machine=nsr-tandem
- 		;;
-@@ -758,18 +772,24 @@
- 	pentiumpro | p6 | 6x86 | athlon | athlon_*)
- 		basic_machine=i686-pc
- 		;;
--	pentiumii | pentium2)
-+	pentiumii | pentium2 | pentiumiii | pentium3)
- 		basic_machine=i686-pc
- 		;;
-+	pentium4)
-+		basic_machine=i786-pc
-+		;;
- 	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
- 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
- 		;;
- 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
- 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
- 		;;
--	pentiumii-* | pentium2-*)
-+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
- 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
- 		;;
-+	pentium4-*)
-+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
- 	pn)
- 		basic_machine=pn-gould
- 		;;
-@@ -828,6 +848,10 @@
- 	sb1el)
- 		basic_machine=mipsisa64sb1el-unknown
- 		;;
-+	sei)
-+		basic_machine=mips-sei
-+		os=-seiux
-+		;;
- 	sequent)
- 		basic_machine=i386-sequent
- 		;;
-@@ -835,6 +859,9 @@
- 		basic_machine=sh-hitachi
- 		os=-hms
- 		;;
-+	sh64)
-+		basic_machine=sh64-unknown
-+		;;
- 	sparclite-wrs | simso-wrs)
- 		basic_machine=sparclite-wrs
- 		os=-vxworks
-@@ -901,10 +928,6 @@
- 		basic_machine=i386-sequent
- 		os=-dynix
- 		;;
--	t3d)
--		basic_machine=alpha-cray
--		os=-unicos
--		;;
- 	t3e)
- 		basic_machine=alphaev5-cray
- 		os=-unicos
-@@ -913,14 +936,18 @@
- 		basic_machine=t90-cray
- 		os=-unicos
- 		;;
--        tic4x | c4x*)
--		basic_machine=tic4x-unknown
--		os=-coff
--		;;
- 	tic54x | c54x*)
- 		basic_machine=tic54x-unknown
- 		os=-coff
- 		;;
-+	tic55x | c55x*)
-+		basic_machine=tic55x-unknown
-+		os=-coff
-+		;;
-+	tic6x | c6x*)
-+		basic_machine=tic6x-unknown
-+		os=-coff
-+		;;
- 	tx39)
- 		basic_machine=mipstx39-unknown
- 		;;
-@@ -977,10 +1004,6 @@
- 		basic_machine=hppa1.1-winbond
- 		os=-proelf
- 		;;
--	windows32)
--		basic_machine=i386-pc
--		os=-windows32-msvcrt
--		;;
- 	xps | xps100)
- 		basic_machine=xps100-honeywell
- 		;;
-@@ -1027,7 +1050,7 @@
- 	we32k)
- 		basic_machine=we32k-att
- 		;;
--	sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele)
-+	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
- 		basic_machine=sh-unknown
- 		;;
- 	sh64)
-@@ -1106,18 +1129,19 @@
- 	      | -aos* \
- 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
--	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-+	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
- 	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
- 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
- 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- 	      | -chorusos* | -chorusrdb* \
- 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- 	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
--	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
-+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
- 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
- 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
--	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* | -powermax*)
-+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei*)
- 	# Remember, each alternative MUST END IN *, to match a version number.
- 		;;
- 	-qnx*)
-@@ -1129,8 +1153,10 @@
- 			;;
- 		esac
- 		;;
-+	-nto-qnx*)
-+		;;
- 	-nto*)
--		os=-nto-qnx
-+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
- 		;;
- 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
- 	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-@@ -1224,6 +1250,12 @@
- 	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
- 		os=-mint
- 		;;
-+	-aros*)
-+		os=-aros
-+		;;
-+	-kaos*)
-+		os=-kaos
-+		;;
- 	-none)
- 		;;
- 	*)
-@@ -1255,6 +1287,9 @@
- 	arm*-semi)
- 		os=-aout
- 		;;
-+    c4x-* | tic4x-*)
-+        os=-coff
-+        ;;
- 	# This must come before the *-dec entry.
- 	pdp10-*)
- 		os=-tops20
-diff -Naur flex-2.5.31.orig/configure flex-2.5.31/configure
---- flex-2.5.31.orig/configure	2003-04-01 16:32:25.000000000 +0000
-+++ flex-2.5.31/configure	2005-01-08 07:43:01.487954912 +0000
-@@ -1,11 +1,10 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.54 for flex 2.5.31.
-+# Generated by GNU Autoconf 2.59 for flex 2.5.31.
- #
- # Report bugs to <lex-help at lists.sourceforge.net>.
- #
--# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
--# Free Software Foundation, Inc.
-+# Copyright (C) 2003 Free Software Foundation, Inc.
- # This configure script is free software; the Free Software Foundation
- # gives unlimited permission to copy, distribute and modify it.
- ## --------------------- ##
-@@ -22,9 +21,10 @@
- elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-   set -o posix
- fi
-+DUALCASE=1; export DUALCASE # for MKS sh
- 
- # Support unset when possible.
--if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
-+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-   as_unset=unset
- else
-   as_unset=false
-@@ -38,9 +38,12 @@
- PS4='+ '
- 
- # NLS nuisances.
--for as_var in LANG LANGUAGE LC_ALL LC_COLLATE LC_CTYPE LC_NUMERIC LC_MESSAGES LC_TIME
-+for as_var in \
-+  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-+  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-+  LC_TELEPHONE LC_TIME
- do
--  if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
-+  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-     eval $as_var=C; export $as_var
-   else
-     $as_unset $as_var
-@@ -84,15 +87,15 @@
- 
- # The user is always right.
- if test "${PATH_SEPARATOR+set}" != set; then
--  echo "#! /bin/sh" >conftest.sh
--  echo  "exit 0"   >>conftest.sh
--  chmod +x conftest.sh
--  if (PATH="/nonexistent;."; conftest.sh) >/dev/null 2>&1; then
-+  echo "#! /bin/sh" >conf$$.sh
-+  echo  "exit 0"   >>conf$$.sh
-+  chmod +x conf$$.sh
-+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-     PATH_SEPARATOR=';'
-   else
-     PATH_SEPARATOR=:
-   fi
--  rm -f conftest.sh
-+  rm -f conf$$.sh
- fi
- 
- 
-@@ -217,16 +220,17 @@
- if mkdir -p . 2>/dev/null; then
-   as_mkdir_p=:
- else
-+  test -d ./-p && rmdir ./-p
-   as_mkdir_p=false
- fi
- 
- as_executable_p="test -f"
- 
- # Sed expression to map a string onto a valid CPP name.
--as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
-+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
- 
- # Sed expression to map a string onto a valid variable name.
--as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
-+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
- 
- 
- # IFS
-@@ -307,7 +311,7 @@
- # include <unistd.h>
- #endif"
- 
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os USE_NLS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB YACC LEX LEXLIB LEX_OUTPUT_ROOT CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE LN_S RANLIB ac_ct_RANLIB BISON HELP2MAN M4 INDENT CPP EGREP LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os USE_NLS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB YACC LEX LEXLIB LEX_OUTPUT_ROOT CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE LN_S RANLIB ac_ct_RANLIB BISON HELP2MAN M4 INDENT CPP EGREP LIBOBJS LTLIBOBJS'
- ac_subst_files=''
- 
- # Initialize some variables set by options.
-@@ -666,7 +670,7 @@
- 
- # Be sure to have absolute paths.
- for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
--              localstatedir libdir includedir oldincludedir infodir mandir
-+	      localstatedir libdir includedir oldincludedir infodir mandir
- do
-   eval ac_val=$`echo $ac_var`
-   case $ac_val in
-@@ -706,10 +710,10 @@
-   # Try the directory containing this script, then its parent.
-   ac_confdir=`(dirname "$0") 2>/dev/null ||
- $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--         X"$0" : 'X\(//\)[^/]' \| \
--         X"$0" : 'X\(//\)$' \| \
--         X"$0" : 'X\(/\)' \| \
--         .     : '\(.\)' 2>/dev/null ||
-+	 X"$0" : 'X\(//\)[^/]' \| \
-+	 X"$0" : 'X\(//\)$' \| \
-+	 X"$0" : 'X\(/\)' \| \
-+	 .     : '\(.\)' 2>/dev/null ||
- echo X"$0" |
-     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-@@ -809,9 +813,9 @@
-   cat <<_ACEOF
- Installation directories:
-   --prefix=PREFIX         install architecture-independent files in PREFIX
--                          [$ac_default_prefix]
-+			  [$ac_default_prefix]
-   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
--                          [PREFIX]
-+			  [PREFIX]
- 
- By default, \`make install' will install all the files in
- \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-@@ -857,8 +861,10 @@
- Optional Features:
-   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
--  --disable-dependency-tracking Speeds up one-time builds
--  --enable-dependency-tracking  Do not reject slow dependency extractors
-+  --enable-maintainer-mode  enable make rules and dependencies not useful
-+			  (and sometimes confusing) to the casual installer
-+  --disable-dependency-tracking  speeds up one-time build
-+  --enable-dependency-tracking   do not reject slow dependency extractors
-   --disable-rpath         do not hardcode runtime library paths
-   --disable-nls           do not use Native Language Support
- 
-@@ -919,12 +925,45 @@
-     ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-     ac_top_srcdir=$ac_top_builddir$srcdir ;;
- esac
--# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
--# absolute.
--ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
--ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
--ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
--ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
-+
-+# Do not use `cd foo && pwd` to compute absolute paths, because
-+# the directories may not exist.
-+case `pwd` in
-+.) ac_abs_builddir="$ac_dir";;
-+*)
-+  case "$ac_dir" in
-+  .) ac_abs_builddir=`pwd`;;
-+  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-+  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-+  esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_top_builddir=${ac_top_builddir}.;;
-+*)
-+  case ${ac_top_builddir}. in
-+  .) ac_abs_top_builddir=$ac_abs_builddir;;
-+  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-+  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-+  esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_srcdir=$ac_srcdir;;
-+*)
-+  case $ac_srcdir in
-+  .) ac_abs_srcdir=$ac_abs_builddir;;
-+  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-+  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-+  esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_top_srcdir=$ac_top_srcdir;;
-+*)
-+  case $ac_top_srcdir in
-+  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-+  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-+  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-+  esac;;
-+esac
- 
-     cd $ac_dir
-     # Check for guested configure; otherwise get Cygnus style configure.
-@@ -935,13 +974,13 @@
-       echo
-       $SHELL $ac_srcdir/configure  --help=recursive
-     elif test -f $ac_srcdir/configure.ac ||
--           test -f $ac_srcdir/configure.in; then
-+	   test -f $ac_srcdir/configure.in; then
-       echo
-       $ac_configure --help
-     else
-       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-     fi
--    cd $ac_popdir
-+    cd "$ac_popdir"
-   done
- fi
- 
-@@ -949,10 +988,9 @@
- if $ac_init_version; then
-   cat <<\_ACEOF
- flex configure 2.5.31
--generated by GNU Autoconf 2.54
-+generated by GNU Autoconf 2.59
- 
--Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
--Free Software Foundation, Inc.
-+Copyright (C) 2003 Free Software Foundation, Inc.
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
- _ACEOF
-@@ -964,7 +1002,7 @@
- running configure, to aid debugging if configure makes a mistake.
- 
- It was created by flex $as_me 2.5.31, which was
--generated by GNU Autoconf 2.54.  Invocation command line was
-+generated by GNU Autoconf 2.59.  Invocation command line was
- 
-   $ $0 $@
- 
-@@ -1016,24 +1054,54 @@
- 
- # Keep a trace of the command line.
- # Strip out --no-create and --no-recursion so they do not pile up.
-+# Strip out --silent because we don't want to record it for future runs.
- # Also quote any args containing shell meta-characters.
-+# Make two passes to allow for proper duplicate-argument suppression.
- ac_configure_args=
-+ac_configure_args0=
-+ac_configure_args1=
- ac_sep=
--for ac_arg
-+ac_must_keep_next=false
-+for ac_pass in 1 2
- do
--  case $ac_arg in
--  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
--  | --no-cr | --no-c | -n ) continue ;;
--  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
--  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
--    continue ;;
--  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
--    ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
--  esac
--  ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
--  # Get rid of the leading space.
--  ac_sep=" "
-+  for ac_arg
-+  do
-+    case $ac_arg in
-+    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-+    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-+    | -silent | --silent | --silen | --sile | --sil)
-+      continue ;;
-+    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-+      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-+    esac
-+    case $ac_pass in
-+    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-+    2)
-+      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-+      if test $ac_must_keep_next = true; then
-+	ac_must_keep_next=false # Got value, back to normal.
-+      else
-+	case $ac_arg in
-+	  *=* | --config-cache | -C | -disable-* | --disable-* \
-+	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-+	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-+	  | -with-* | --with-* | -without-* | --without-* | --x)
-+	    case "$ac_configure_args0 " in
-+	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-+	    esac
-+	    ;;
-+	  -* ) ac_must_keep_next=true ;;
-+	esac
-+      fi
-+      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-+      # Get rid of the leading space.
-+      ac_sep=" "
-+      ;;
-+    esac
-+  done
- done
-+$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-+$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
- 
- # When interrupted or exit'd, cleanup temporary files, and complete
- # config.log.  We remove comments because anyway the quotes in there
-@@ -1057,12 +1125,12 @@
-     case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
-     *ac_space=\ *)
-       sed -n \
--        "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
--    	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
-+	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
-       ;;
-     *)
-       sed -n \
--        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-+	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-       ;;
-     esac;
- }
-@@ -1091,7 +1159,7 @@
-       for ac_var in $ac_subst_files
-       do
- 	eval ac_val=$`echo $ac_var`
--        echo "$ac_var='"'"'$ac_val'"'"'"
-+	echo "$ac_var='"'"'$ac_val'"'"'"
-       done | sort
-       echo
-     fi
-@@ -1110,7 +1178,7 @@
-       echo "$as_me: caught signal $ac_signal"
-     echo "$as_me: exit $exit_status"
-   } >&5
--  rm -f core core.* *.core &&
-+  rm -f core *.core &&
-   rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
-     exit $exit_status
-      ' 0
-@@ -1190,7 +1258,7 @@
- # value.
- ac_cache_corrupted=false
- for ac_var in `(set) 2>&1 |
--               sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
-+	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
-   eval ac_old_set=\$ac_cv_env_${ac_var}_set
-   eval ac_new_set=\$ac_env_${ac_var}_set
-   eval ac_old_val="\$ac_cv_env_${ac_var}_value"
-@@ -1207,13 +1275,13 @@
-     ,);;
-     *)
-       if test "x$ac_old_val" != "x$ac_new_val"; then
--        { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-+	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
- echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
--        { echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-+	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
- echo "$as_me:   former value:  $ac_old_val" >&2;}
--        { echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-+	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
- echo "$as_me:   current value: $ac_new_val" >&2;}
--        ac_cache_corrupted=:
-+	ac_cache_corrupted=:
-       fi;;
-   esac
-   # Pass precious variables to config.status.
-@@ -1269,8 +1337,32 @@
- 
- 
- 
-+echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
-+echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
-+    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
-+if test "${enable_maintainer_mode+set}" = set; then
-+  enableval="$enable_maintainer_mode"
-+  USE_MAINTAINER_MODE=$enableval
-+else
-+  USE_MAINTAINER_MODE=no
-+fi;
-+  echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
-+
-+
-+if test $USE_MAINTAINER_MODE = yes; then
-+  MAINTAINER_MODE_TRUE=
-+  MAINTAINER_MODE_FALSE='#'
-+else
-+  MAINTAINER_MODE_TRUE='#'
-+  MAINTAINER_MODE_FALSE=
-+fi
-+
-+  MAINT=$MAINTAINER_MODE_TRUE
-+
-+
- 
--am__api_version="1.7"
-+am__api_version="1.8"
- ac_aux_dir=
- for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-   if test -f $ac_dir/install-sh; then
-@@ -1307,6 +1399,7 @@
- # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
- # AFS /usr/afsws/bin/install, which mishandles nonexistent args
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-+# OS/2's system install, which has a completely different semantic
- # ./install, which can be erroneously created by make from ./install.sh.
- echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
- echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
-@@ -1323,6 +1416,7 @@
- case $as_dir/ in
-   ./ | .// | /cC/* | \
-   /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-+  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-   /usr/ucb/* ) ;;
-   *)
-     # OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -1330,20 +1424,20 @@
-     # by default.
-     for ac_prog in ginstall scoinst install; do
-       for ac_exec_ext in '' $ac_executable_extensions; do
--        if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
--          if test $ac_prog = install &&
--            grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
--            # AIX install.  It has an incompatible calling convention.
--            :
--          elif test $ac_prog = install &&
--            grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
--            # program-specific install script used by HP pwplus--don't use.
--            :
--          else
--            ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
--            break 3
--          fi
--        fi
-+	if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-+	  if test $ac_prog = install &&
-+	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-+	    # AIX install.  It has an incompatible calling convention.
-+	    :
-+	  elif test $ac_prog = install &&
-+	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-+	    # program-specific install script used by HP pwplus--don't use.
-+	    :
-+	  else
-+	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-+	    break 3
-+	  fi
-+	fi
-       done
-     done
-     ;;
-@@ -1431,7 +1525,6 @@
- program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
- rm conftest.sed
- 
--
- # expand $ac_aux_dir to an absolute path
- am_aux_dir=`cd $ac_aux_dir && pwd`
- 
-@@ -1445,6 +1538,31 @@
- echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
- fi
- 
-+if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-+  # Keeping the `.' argument allows $(mkdir_p) to be used without
-+  # argument.  Indeed, we sometimes output rules like
-+  #   $(mkdir_p) $(somedir)
-+  # where $(somedir) is conditionally defined.
-+  # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more
-+  # expensive solution, as it forces Make to start a sub-shell.)
-+  mkdir_p='mkdir -p -- .'
-+else
-+  # On NextStep and OpenStep, the `mkdir' command does not
-+  # recognize any option.  It will interpret all options as
-+  # directories to create, and then abort because `.' already
-+  # exists.
-+  for d in ./-p ./--version;
-+  do
-+    test -d $d && rmdir $d
-+  done
-+  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-+  if test -f "$ac_aux_dir/mkinstalldirs"; then
-+    mkdir_p='$(mkinstalldirs)'
-+  else
-+    mkdir_p='$(install_sh) -d'
-+  fi
-+fi
-+
- for ac_prog in gawk mawk nawk awk
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -1485,15 +1603,15 @@
-   test -n "$AWK" && break
- done
- 
--echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \${MAKE}" >&5
--echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
--set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
-+echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
-+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
- if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.make <<\_ACEOF
- all:
--	@echo 'ac_maketemp="${MAKE}"'
-+	@echo 'ac_maketemp="$(MAKE)"'
- _ACEOF
- # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
- eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
-@@ -1514,7 +1632,16 @@
-   SET_MAKE="MAKE=${MAKE-make}"
- fi
- 
-- # test to see if srcdir already configured
-+rm -rf .tst 2>/dev/null
-+mkdir .tst 2>/dev/null
-+if test -d .tst; then
-+  am__leading_dot=.
-+else
-+  am__leading_dot=_
-+fi
-+rmdir .tst 2>/dev/null
-+
-+# test to see if srcdir already configured
- if test "`cd $srcdir && pwd`" != "`pwd`" &&
-    test -f $srcdir/config.status; then
-   { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-@@ -1533,8 +1660,8 @@
- 
- 
- # Define the identity of the package.
-- PACKAGE=flex
-- VERSION=2.5.31
-+ PACKAGE='flex'
-+ VERSION='2.5.31'
- 
- 
- cat >>confdefs.h <<_ACEOF
-@@ -1874,24 +2001,16 @@
-   eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
-   prefix="$acl_save_prefix"
- 
--rm -f .deps 2>/dev/null
--mkdir .deps 2>/dev/null
--if test -d .deps; then
--  DEPDIR=.deps
--else
--  # MS-DOS does not allow filenames that begin with a dot.
--  DEPDIR=_deps
--fi
--rmdir .deps 2>/dev/null
--
-+DEPDIR="${am__leading_dot}deps"
- 
-           ac_config_commands="$ac_config_commands depfiles"
- 
- 
- am_make=${MAKE-make}
- cat > confinc << 'END'
--doit:
-+am__doit:
- 	@echo done
-+.PHONY: am__doit
- END
- # If we don't find an include directive, just comment out the code.
- echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-@@ -2256,8 +2375,10 @@
- fi
- 
- 
--test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH" >&5
--echo "$as_me: error: no acceptable C compiler found in \$PATH" >&2;}
-+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: no acceptable C compiler found in \$PATH
-+See \`config.log' for more details." >&2;}
-    { (exit 1); exit 1; }; }
- 
- # Provide some information about the compiler.
-@@ -2281,8 +2402,11 @@
-   (exit $ac_status); }
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- 
- int
- main ()
-@@ -2293,12 +2417,12 @@
- }
- _ACEOF
- ac_clean_files_save=$ac_clean_files
--ac_clean_files="$ac_clean_files a.out a.exe"
-+ac_clean_files="$ac_clean_files a.out a.exe b.out"
- # Try to create an executable without -o first, disregard a.out.
- # It will help us diagnose broken compilers, and finding out an intuition
- # of exeext.
--echo "$as_me:$LINENO: checking for C compiler default output" >&5
--echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
- ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
- if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
-   (eval $ac_link_default) 2>&5
-@@ -2312,27 +2436,39 @@
- # Be careful to initialize this variable, since it used to be cached.
- # Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
- ac_cv_exeext=
--for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.*; do
-+# b.out is created by i960 compilers.
-+for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
-+do
-   test -f "$ac_file" || continue
-   case $ac_file in
--    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
--    a.out ) # We found the default executable, but exeext='' is most
--            # certainly right.
--            break;;
--    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
--          # FIXME: I believe we export ac_cv_exeext for Libtool --akim.
--          export ac_cv_exeext
--          break;;
--    * ) break;;
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
-+	;;
-+    conftest.$ac_ext )
-+	# This is the source file.
-+	;;
-+    [ab].out )
-+	# We found the default executable, but exeext='' is most
-+	# certainly right.
-+	break;;
-+    *.* )
-+	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-+	# FIXME: I believe we export ac_cv_exeext for Libtool,
-+	# but it would be cool to find out if it's true.  Does anybody
-+	# maintain Libtool? --akim.
-+	export ac_cv_exeext
-+	break;;
-+    * )
-+	break;;
-   esac
- done
- else
-   echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- { { echo "$as_me:$LINENO: error: C compiler cannot create executables
--check \`config.log' for details." >&5
-+See \`config.log' for more details." >&5
- echo "$as_me: error: C compiler cannot create executables
--check \`config.log' for details." >&2;}
-+See \`config.log' for more details." >&2;}
-    { (exit 77); exit 77; }; }
- fi
- 
-@@ -2359,9 +2495,11 @@
- 	cross_compiling=yes
-     else
- 	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
--If you meant to cross compile, use \`--host'." >&5
-+If you meant to cross compile, use \`--host'.
-+See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run C compiled programs.
--If you meant to cross compile, use \`--host'." >&2;}
-+If you meant to cross compile, use \`--host'.
-+See \`config.log' for more details." >&2;}
-    { (exit 1); exit 1; }; }
-     fi
-   fi
-@@ -2369,7 +2507,7 @@
- echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 
--rm -f a.out a.exe conftest$ac_cv_exeext
-+rm -f a.out a.exe conftest$ac_cv_exeext b.out
- ac_clean_files=$ac_clean_files_save
- # Check the compiler produces executables we can run.  If not, either
- # the compiler is broken, or we cross compile.
-@@ -2394,14 +2532,16 @@
-   case $ac_file in
-     *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
-     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
--          export ac_cv_exeext
--          break;;
-+	  export ac_cv_exeext
-+	  break;;
-     * ) break;;
-   esac
- done
- else
--  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link" >&5
--echo "$as_me: error: cannot compute suffix of executables: cannot compile and link" >&2;}
-+  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-+See \`config.log' for more details." >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
-@@ -2418,8 +2558,11 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- 
- int
- main ()
-@@ -2444,9 +2587,12 @@
- done
- else
-   echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile" >&5
--echo "$as_me: error: cannot compute suffix of object files: cannot compile" >&2;}
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute suffix of object files: cannot compile
-+See \`config.log' for more details." >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
-@@ -2462,8 +2608,11 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- 
- int
- main ()
-@@ -2478,11 +2627,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2491,10 +2649,11 @@
-   ac_compiler_gnu=yes
- else
-   echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_compiler_gnu=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cv_c_compiler_gnu=$ac_compiler_gnu
- 
- fi
-@@ -2510,8 +2669,11 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- 
- int
- main ()
-@@ -2523,11 +2685,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2536,10 +2707,11 @@
-   ac_cv_prog_cc_g=yes
- else
-   echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_prog_cc_g=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
- echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
-@@ -2566,8 +2738,11 @@
-   ac_cv_prog_cc_stdc=no
- ac_save_CC=$CC
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- #include <stdarg.h>
- #include <stdio.h>
- #include <sys/types.h>
-@@ -2590,6 +2765,16 @@
-   va_end (v);
-   return s;
- }
-+
-+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-+   function prototypes and stuff, but not '\xHH' hex character constants.
-+   These don't provoke an error unfortunately, instead are silently treated
-+   as 'x'.  The following induces an error, until -std1 is added to get
-+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-+   array size at least.  It's necessary to write '\x00'==0 to get something
-+   that's true only with -std1.  */
-+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-+
- int test (int i, double x);
- struct s1 {int (*f) (int a);};
- struct s2 {int (*f) (double a);};
-@@ -2616,11 +2801,20 @@
-   CC="$ac_save_CC $ac_arg"
-   rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2630,9 +2824,10 @@
- break
- else
-   echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest.$ac_objext
-+rm -f conftest.err conftest.$ac_objext
- done
- rm -f conftest.$ac_ext conftest.$ac_objext
- CC=$ac_save_CC
-@@ -2660,19 +2855,27 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   for ac_declaration in \
--   ''\
--   '#include <stdlib.h>' \
-+   '' \
-    'extern "C" void std::exit (int) throw (); using std::exit;' \
-    'extern "C" void std::exit (int); using std::exit;' \
-    'extern "C" void exit (int) throw ();' \
-@@ -2680,10 +2883,13 @@
-    'void exit (int);'
- do
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
--#include <stdlib.h>
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- $ac_declaration
-+#include <stdlib.h>
- int
- main ()
- {
-@@ -2694,11 +2900,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2707,13 +2922,17 @@
-   :
- else
-   echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- continue
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- $ac_declaration
- int
- main ()
-@@ -2725,11 +2944,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2738,9 +2966,10 @@
-   break
- else
-   echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- rm -f conftest*
- if test -n "$ac_declaration"; then
-@@ -2751,9 +2980,10 @@
- 
- else
-   echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -2778,18 +3008,34 @@
-   # using a relative directory.
-   cp "$am_depcomp" conftest.dir
-   cd conftest.dir
-+  # We will build objects and dependencies in a subdirectory because
-+  # it helps to detect inapplicable dependency modes.  For instance
-+  # both Tru64's cc and ICC support -MD to output dependencies as a
-+  # side effect of compilation, but ICC will put the dependencies in
-+  # the current directory while Tru64 will put them in the object
-+  # directory.
-+  mkdir sub
- 
-   am_cv_CC_dependencies_compiler_type=none
-   if test "$am_compiler_list" = ""; then
-      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-   fi
-   for depmode in $am_compiler_list; do
-+    # Setup a source with many dependencies, because some compilers
-+    # like to wrap large dependency lists on column 80 (with \), and
-+    # we should not choose a depcomp mode which is confused by this.
-+    #
-     # We need to recreate these files for each test, as the compiler may
-     # overwrite some of them when testing with obscure command lines.
-     # This happens at least with the AIX C compiler.
--    echo '#include "conftest.h"' > conftest.c
--    echo 'int i;' > conftest.h
--    echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
-+    : > sub/conftest.c
-+    for i in 1 2 3 4 5 6; do
-+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+      # Solaris 8's {/usr,}/bin/sh.
-+      touch sub/conftst$i.h
-+    done
-+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
- 
-     case $depmode in
-     nosideeffect)
-@@ -2807,13 +3053,25 @@
-     # mode.  It turns out that the SunPro C++ compiler does not properly
-     # handle `-M -o', and we need to detect this.
-     if depmode=$depmode \
--       source=conftest.c object=conftest.o \
--       depfile=conftest.Po tmpdepfile=conftest.TPo \
--       $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
--       grep conftest.h conftest.Po > /dev/null 2>&1 &&
-+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-+         >/dev/null 2>conftest.err &&
-+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
--      am_cv_CC_dependencies_compiler_type=$depmode
--      break
-+      # icc doesn't choke on unknown options, it will just issue warnings
-+      # or remarks (even with -Werror).  So we grep stderr for any message
-+      # that says an option was ignored or not supported.
-+      # When given -MP, icc 7.0 and 7.1 complain thusly:
-+      #   icc: Command line warning: ignoring option '-M'; no argument required
-+      # The diagnosis changed in icc 8.0:
-+      #   icc: Command line remark: option '-MP' not supported
-+      if (grep 'ignoring option' conftest.err ||
-+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-+        am_cv_CC_dependencies_compiler_type=$depmode
-+        break
-+      fi
-     fi
-   done
- 
-@@ -3459,8 +3717,11 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- #include <libintl.h>
- extern int _nl_msg_cat_cntr;
- extern int *_nl_domain_bindings;
-@@ -3475,11 +3736,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -3488,10 +3758,12 @@
-   gt_cv_func_gnugettext1_libc=yes
- else
-   echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- gt_cv_func_gnugettext1_libc=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libc" >&5
- echo "${ECHO_T}$gt_cv_func_gnugettext1_libc" >&6
-@@ -3536,8 +3808,11 @@
-     am_cv_func_iconv="no, consider installing GNU libiconv"
-     am_cv_lib_iconv=no
-     cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- #include <stdlib.h>
- #include <iconv.h>
- int
-@@ -3552,11 +3827,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -3565,15 +3849,20 @@
-   am_cv_func_iconv=yes
- else
-   echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
-     if test "$am_cv_func_iconv" != yes; then
-       am_save_LIBS="$LIBS"
-       LIBS="$LIBS $LIBICONV"
-       cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- #include <stdlib.h>
- #include <iconv.h>
- int
-@@ -3588,11 +3877,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -3602,9 +3900,11 @@
-         am_cv_func_iconv=yes
- else
-   echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
-       LIBS="$am_save_LIBS"
-     fi
- 
-@@ -4020,8 +4320,11 @@
-             gt_save_LIBS="$LIBS"
-             LIBS="$LIBS $LIBINTL"
-                         cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- #include <libintl.h>
- extern int _nl_msg_cat_cntr;
- extern
-@@ -4040,11 +4343,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4053,15 +4365,20 @@
-   gt_cv_func_gnugettext1_libintl=yes
- else
-   echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- gt_cv_func_gnugettext1_libintl=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
-                         if test "$gt_cv_func_gnugettext1_libintl" != yes && test -n "$LIBICONV"; then
-               LIBS="$LIBS $LIBICONV"
-               cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- #include <libintl.h>
- extern int _nl_msg_cat_cntr;
- extern
-@@ -4080,11 +4397,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4096,9 +4422,11 @@
- 
- else
-   echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
-             fi
-             CPPFLAGS="$gt_save_CPPFLAGS"
-             LIBS="$gt_save_LIBS"
-@@ -4282,8 +4610,11 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lfl  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
-@@ -4302,11 +4633,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4315,10 +4655,12 @@
-   ac_cv_lib_fl_yywrap=yes
- else
-   echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_fl_yywrap=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_fl_yywrap" >&5
-@@ -4334,8 +4676,11 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ll  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
-@@ -4354,11 +4699,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4367,10 +4721,12 @@
-   ac_cv_lib_l_yywrap=yes
- else
-   echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_l_yywrap=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_l_yywrap" >&5
-@@ -4432,11 +4788,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4445,9 +4810,11 @@
-   ac_cv_prog_lex_yytext_pointer=yes
- else
-   echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_save_LIBS
- rm -f "${LEX_OUTPUT_ROOT}.c"
- 
-@@ -4775,8 +5142,10 @@
- fi
- 
- 
--test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH" >&5
--echo "$as_me: error: no acceptable C compiler found in \$PATH" >&2;}
-+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: no acceptable C compiler found in \$PATH
-+See \`config.log' for more details." >&2;}
-    { (exit 1); exit 1; }; }
- 
- # Provide some information about the compiler.
-@@ -4805,8 +5174,11 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- 
- int
- main ()
-@@ -4821,11 +5193,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4834,10 +5215,11 @@
-   ac_compiler_gnu=yes
- else
-   echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_compiler_gnu=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cv_c_compiler_gnu=$ac_compiler_gnu
- 
- fi
-@@ -4853,8 +5235,11 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- 
- int
- main ()
-@@ -4866,11 +5251,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4879,10 +5273,11 @@
-   ac_cv_prog_cc_g=yes
- else
-   echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_prog_cc_g=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
- echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
-@@ -4909,8 +5304,11 @@
-   ac_cv_prog_cc_stdc=no
- ac_save_CC=$CC
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- #include <stdarg.h>
- #include <stdio.h>
- #include <sys/types.h>
-@@ -4933,6 +5331,16 @@
-   va_end (v);
-   return s;
- }
-+
-+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-+   function prototypes and stuff, but not '\xHH' hex character constants.
-+   These don't provoke an error unfortunately, instead are silently treated
-+   as 'x'.  The following induces an error, until -std1 is added to get
-+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-+   array size at least.  It's necessary to write '\x00'==0 to get something
-+   that's true only with -std1.  */
-+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-+
- int test (int i, double x);
- struct s1 {int (*f) (int a);};
- struct s2 {int (*f) (double a);};
-@@ -4959,11 +5367,20 @@
-   CC="$ac_save_CC $ac_arg"
-   rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4973,9 +5390,10 @@
- break
- else
-   echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest.$ac_objext
-+rm -f conftest.err conftest.$ac_objext
- done
- rm -f conftest.$ac_ext conftest.$ac_objext
- CC=$ac_save_CC
-@@ -5003,19 +5421,27 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   for ac_declaration in \
--   ''\
--   '#include <stdlib.h>' \
-+   '' \
-    'extern "C" void std::exit (int) throw (); using std::exit;' \
-    'extern "C" void std::exit (int); using std::exit;' \
-    'extern "C" void exit (int) throw ();' \
-@@ -5023,10 +5449,13 @@
-    'void exit (int);'
- do
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
--#include <stdlib.h>
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- $ac_declaration
-+#include <stdlib.h>
- int
- main ()
- {
-@@ -5037,11 +5466,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -5050,13 +5488,17 @@
-   :
- else
-   echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- continue
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- $ac_declaration
- int
- main ()
-@@ -5068,11 +5510,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -5081,9 +5532,10 @@
-   break
- else
-   echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- rm -f conftest*
- if test -n "$ac_declaration"; then
-@@ -5094,9 +5546,10 @@
- 
- else
-   echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -5121,18 +5574,34 @@
-   # using a relative directory.
-   cp "$am_depcomp" conftest.dir
-   cd conftest.dir
-+  # We will build objects and dependencies in a subdirectory because
-+  # it helps to detect inapplicable dependency modes.  For instance
-+  # both Tru64's cc and ICC support -MD to output dependencies as a
-+  # side effect of compilation, but ICC will put the dependencies in
-+  # the current directory while Tru64 will put them in the object
-+  # directory.
-+  mkdir sub
- 
-   am_cv_CC_dependencies_compiler_type=none
-   if test "$am_compiler_list" = ""; then
-      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-   fi
-   for depmode in $am_compiler_list; do
-+    # Setup a source with many dependencies, because some compilers
-+    # like to wrap large dependency lists on column 80 (with \), and
-+    # we should not choose a depcomp mode which is confused by this.
-+    #
-     # We need to recreate these files for each test, as the compiler may
-     # overwrite some of them when testing with obscure command lines.
-     # This happens at least with the AIX C compiler.
--    echo '#include "conftest.h"' > conftest.c
--    echo 'int i;' > conftest.h
--    echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
-+    : > sub/conftest.c
-+    for i in 1 2 3 4 5 6; do
-+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+      # Solaris 8's {/usr,}/bin/sh.
-+      touch sub/conftst$i.h
-+    done
-+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
- 
-     case $depmode in
-     nosideeffect)
-@@ -5150,13 +5619,25 @@
-     # mode.  It turns out that the SunPro C++ compiler does not properly
-     # handle `-M -o', and we need to detect this.
-     if depmode=$depmode \
--       source=conftest.c object=conftest.o \
--       depfile=conftest.Po tmpdepfile=conftest.TPo \
--       $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
--       grep conftest.h conftest.Po > /dev/null 2>&1 &&
-+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-+         >/dev/null 2>conftest.err &&
-+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
--      am_cv_CC_dependencies_compiler_type=$depmode
--      break
-+      # icc doesn't choke on unknown options, it will just issue warnings
-+      # or remarks (even with -Werror).  So we grep stderr for any message
-+      # that says an option was ignored or not supported.
-+      # When given -MP, icc 7.0 and 7.1 complain thusly:
-+      #   icc: Command line warning: ignoring option '-M'; no argument required
-+      # The diagnosis changed in icc 8.0:
-+      #   icc: Command line remark: option '-MP' not supported
-+      if (grep 'ignoring option' conftest.err ||
-+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-+        am_cv_CC_dependencies_compiler_type=$depmode
-+        break
-+      fi
-     fi
-   done
- 
-@@ -5303,8 +5784,11 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- 
- int
- main ()
-@@ -5319,11 +5803,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -5332,10 +5825,11 @@
-   ac_compiler_gnu=yes
- else
-   echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_compiler_gnu=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
- 
- fi
-@@ -5351,8 +5845,11 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- 
- int
- main ()
-@@ -5364,11 +5861,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -5377,10 +5883,11 @@
-   ac_cv_prog_cxx_g=yes
- else
-   echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_prog_cxx_g=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
- echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
-@@ -5400,8 +5907,7 @@
-   fi
- fi
- for ac_declaration in \
--   ''\
--   '#include <stdlib.h>' \
-+   '' \
-    'extern "C" void std::exit (int) throw (); using std::exit;' \
-    'extern "C" void std::exit (int); using std::exit;' \
-    'extern "C" void exit (int) throw ();' \
-@@ -5409,10 +5915,13 @@
-    'void exit (int);'
- do
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
--#include <stdlib.h>
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- $ac_declaration
-+#include <stdlib.h>
- int
- main ()
- {
-@@ -5423,11 +5932,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -5436,13 +5954,17 @@
-   :
- else
-   echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- continue
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- $ac_declaration
- int
- main ()
-@@ -5454,11 +5976,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -5467,9 +5998,10 @@
-   break
- else
-   echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- rm -f conftest*
- if test -n "$ac_declaration"; then
-@@ -5502,18 +6034,34 @@
-   # using a relative directory.
-   cp "$am_depcomp" conftest.dir
-   cd conftest.dir
-+  # We will build objects and dependencies in a subdirectory because
-+  # it helps to detect inapplicable dependency modes.  For instance
-+  # both Tru64's cc and ICC support -MD to output dependencies as a
-+  # side effect of compilation, but ICC will put the dependencies in
-+  # the current directory while Tru64 will put them in the object
-+  # directory.
-+  mkdir sub
- 
-   am_cv_CXX_dependencies_compiler_type=none
-   if test "$am_compiler_list" = ""; then
-      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-   fi
-   for depmode in $am_compiler_list; do
-+    # Setup a source with many dependencies, because some compilers
-+    # like to wrap large dependency lists on column 80 (with \), and
-+    # we should not choose a depcomp mode which is confused by this.
-+    #
-     # We need to recreate these files for each test, as the compiler may
-     # overwrite some of them when testing with obscure command lines.
-     # This happens at least with the AIX C compiler.
--    echo '#include "conftest.h"' > conftest.c
--    echo 'int i;' > conftest.h
--    echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
-+    : > sub/conftest.c
-+    for i in 1 2 3 4 5 6; do
-+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+      # Solaris 8's {/usr,}/bin/sh.
-+      touch sub/conftst$i.h
-+    done
-+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
- 
-     case $depmode in
-     nosideeffect)
-@@ -5531,13 +6079,25 @@
-     # mode.  It turns out that the SunPro C++ compiler does not properly
-     # handle `-M -o', and we need to detect this.
-     if depmode=$depmode \
--       source=conftest.c object=conftest.o \
--       depfile=conftest.Po tmpdepfile=conftest.TPo \
--       $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
--       grep conftest.h conftest.Po > /dev/null 2>&1 &&
-+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-+         >/dev/null 2>conftest.err &&
-+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
--      am_cv_CXX_dependencies_compiler_type=$depmode
--      break
-+      # icc doesn't choke on unknown options, it will just issue warnings
-+      # or remarks (even with -Werror).  So we grep stderr for any message
-+      # that says an option was ignored or not supported.
-+      # When given -MP, icc 7.0 and 7.1 complain thusly:
-+      #   icc: Command line warning: ignoring option '-M'; no argument required
-+      # The diagnosis changed in icc 8.0:
-+      #   icc: Command line remark: option '-MP' not supported
-+      if (grep 'ignoring option' conftest.err ||
-+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-+        am_cv_CXX_dependencies_compiler_type=$depmode
-+        break
-+      fi
-     fi
-   done
- 
-@@ -5825,7 +6385,7 @@
- if test "$INDENT" != indent ; then
-    echo "$as_me:$LINENO: checking if $INDENT is GNU indent" >&5
- echo $ECHO_N "checking if $INDENT is GNU indent... $ECHO_C" >&6
--   if $INDENT --version 2>/dev/null | head -1|grep "GNU indent" > /dev/null ; then
-+   if $INDENT --version 2>/dev/null | head -n 1|grep "GNU indent" > /dev/null ; then
-       echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-    else
-@@ -5848,8 +6408,11 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
-@@ -5868,11 +6431,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -5881,10 +6453,12 @@
-   ac_cv_lib_m_log=yes
- else
-   echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_m_log=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_m_log" >&5
-@@ -5923,13 +6497,22 @@
- do
-   # Use a header file that comes with gcc, so configuring glibc
-   # with a fresh cross-compiler works.
-+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+  # <limits.h> exists even on freestanding compilers.
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
--#include <assert.h>
--                     Syntax error
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+		     Syntax error
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-@@ -5941,6 +6524,7 @@
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-   else
-     ac_cpp_err=
-   fi
-@@ -5951,7 +6535,8 @@
-   :
- else
-   echo "$as_me: failed program was:" >&5
--  cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-   # Broken: fails on valid input.
- continue
- fi
-@@ -5960,8 +6545,11 @@
-   # OK, works on sane cases.  Now check whether non-existent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- #include <ac_nonexistent.h>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-@@ -5974,6 +6562,7 @@
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-   else
-     ac_cpp_err=
-   fi
-@@ -5985,7 +6574,8 @@
- continue
- else
-   echo "$as_me: failed program was:" >&5
--  cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-   # Passes both tests.
- ac_preproc_ok=:
- break
-@@ -6014,13 +6604,22 @@
- do
-   # Use a header file that comes with gcc, so configuring glibc
-   # with a fresh cross-compiler works.
-+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+  # <limits.h> exists even on freestanding compilers.
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
--#include <assert.h>
--                     Syntax error
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+		     Syntax error
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-@@ -6032,6 +6631,7 @@
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-   else
-     ac_cpp_err=
-   fi
-@@ -6042,7 +6642,8 @@
-   :
- else
-   echo "$as_me: failed program was:" >&5
--  cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-   # Broken: fails on valid input.
- continue
- fi
-@@ -6051,8 +6652,11 @@
-   # OK, works on sane cases.  Now check whether non-existent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- #include <ac_nonexistent.h>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-@@ -6065,6 +6669,7 @@
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-   else
-     ac_cpp_err=
-   fi
-@@ -6076,7 +6681,8 @@
- continue
- else
-   echo "$as_me: failed program was:" >&5
--  cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-   # Passes both tests.
- ac_preproc_ok=:
- break
-@@ -6089,8 +6695,10 @@
- if $ac_preproc_ok; then
-   :
- else
--  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check" >&5
--echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
-+  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-+See \`config.log' for more details." >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
-@@ -6122,44 +6730,62 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- #include <stdlib.h>
- #include <stdarg.h>
- #include <string.h>
- #include <float.h>
- 
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_c_preproc_warn_flag
--  else
--    ac_cpp_err=
--  fi
--else
--  ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-   ac_cv_header_stdc=yes
- else
-   echo "$as_me: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  ac_cv_header_stdc=no
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_header_stdc=no
- fi
--rm -f conftest.err conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- if test $ac_cv_header_stdc = yes; then
-   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- #include <string.h>
- 
- _ACEOF
-@@ -6176,8 +6802,11 @@
- if test $ac_cv_header_stdc = yes; then
-   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- #include <stdlib.h>
- 
- _ACEOF
-@@ -6197,16 +6826,20 @@
-   :
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- #include <ctype.h>
- #if ((' ' & 0x0FF) == 0x020)
- # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
- # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
- #else
--# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \
--                     || ('j' <= (c) && (c) <= 'r') \
--                     || ('s' <= (c) && (c) <= 'z'))
-+# define ISLOWER(c) \
-+		   (('a' <= (c) && (c) <= 'i') \
-+		     || ('j' <= (c) && (c) <= 'r') \
-+		     || ('s' <= (c) && (c) <= 'z'))
- # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
- #endif
- 
-@@ -6217,7 +6850,7 @@
-   int i;
-   for (i = 0; i < 256; i++)
-     if (XOR (islower (i), ISLOWER (i))
--        || toupper (i) != TOUPPER (i))
-+	|| toupper (i) != TOUPPER (i))
-       exit(2);
-   exit (0);
- }
-@@ -6237,11 +6870,12 @@
- else
-   echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ( exit $ac_status )
- ac_cv_header_stdc=no
- fi
--rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
- fi
-@@ -6266,7 +6900,7 @@
- 
- 
- for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
--                  inttypes.h stdint.h unistd.h
-+		  inttypes.h stdint.h unistd.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- echo "$as_me:$LINENO: checking for $ac_header" >&5
-@@ -6275,19 +6909,31 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- $ac_includes_default
- 
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -6296,10 +6942,11 @@
-   eval "$as_ac_Header=yes"
- else
-   echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- eval "$as_ac_Header=no"
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-@@ -6333,18 +6980,30 @@
- echo "$as_me:$LINENO: checking $ac_header usability" >&5
- echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- $ac_includes_default
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -6353,10 +7012,11 @@
-   ac_header_compiler=yes
- else
-   echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_header_compiler=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
- echo "${ECHO_T}$ac_header_compiler" >&6
- 
-@@ -6364,8 +7024,11 @@
- echo "$as_me:$LINENO: checking $ac_header presence" >&5
- echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- #include <$ac_header>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-@@ -6378,6 +7041,7 @@
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-   else
-     ac_cpp_err=
-   fi
-@@ -6388,7 +7052,8 @@
-   ac_header_preproc=yes
- else
-   echo "$as_me: failed program was:" >&5
--  cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-   ac_header_preproc=no
- fi
- rm -f conftest.err conftest.$ac_ext
-@@ -6396,26 +7061,43 @@
- echo "${ECHO_T}$ac_header_preproc" >&6
- 
- # So?  What about this header?
--case $ac_header_compiler:$ac_header_preproc in
--  yes:no )
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-     { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
--  no:yes )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-     { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
- echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## --------------------------------------------- ##
-+## Report this to lex-help at lists.sourceforge.net ##
-+## --------------------------------------------- ##
-+_ASBOX
-+    ) |
-+      sed "s/^/$as_me: WARNING:     /" >&2
-+    ;;
- esac
- echo "$as_me:$LINENO: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  eval "$as_ac_Header=$ac_header_preproc"
-+  eval "$as_ac_Header=\$ac_header_preproc"
- fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-@@ -6448,18 +7130,30 @@
- echo "$as_me:$LINENO: checking $ac_header usability" >&5
- echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- $ac_includes_default
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -6468,10 +7162,11 @@
-   ac_header_compiler=yes
- else
-   echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_header_compiler=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
- echo "${ECHO_T}$ac_header_compiler" >&6
- 
-@@ -6479,8 +7174,11 @@
- echo "$as_me:$LINENO: checking $ac_header presence" >&5
- echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- #include <$ac_header>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-@@ -6493,6 +7191,7 @@
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-   else
-     ac_cpp_err=
-   fi
-@@ -6503,7 +7202,8 @@
-   ac_header_preproc=yes
- else
-   echo "$as_me: failed program was:" >&5
--  cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-   ac_header_preproc=no
- fi
- rm -f conftest.err conftest.$ac_ext
-@@ -6511,26 +7211,43 @@
- echo "${ECHO_T}$ac_header_preproc" >&6
- 
- # So?  What about this header?
--case $ac_header_compiler:$ac_header_preproc in
--  yes:no )
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-     { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
--  no:yes )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-     { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
- echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## --------------------------------------------- ##
-+## Report this to lex-help at lists.sourceforge.net ##
-+## --------------------------------------------- ##
-+_ASBOX
-+    ) |
-+      sed "s/^/$as_me: WARNING:     /" >&2
-+    ;;
- esac
- echo "$as_me:$LINENO: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  eval "$as_ac_Header=$ac_header_preproc"
-+  eval "$as_ac_Header=\$ac_header_preproc"
- fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-@@ -6562,18 +7279,30 @@
- echo "$as_me:$LINENO: checking $ac_header usability" >&5
- echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- $ac_includes_default
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -6582,10 +7311,11 @@
-   ac_header_compiler=yes
- else
-   echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_header_compiler=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
- echo "${ECHO_T}$ac_header_compiler" >&6
- 
-@@ -6593,8 +7323,11 @@
- echo "$as_me:$LINENO: checking $ac_header presence" >&5
- echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- #include <$ac_header>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-@@ -6607,6 +7340,7 @@
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-   else
-     ac_cpp_err=
-   fi
-@@ -6617,7 +7351,8 @@
-   ac_header_preproc=yes
- else
-   echo "$as_me: failed program was:" >&5
--  cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-   ac_header_preproc=no
- fi
- rm -f conftest.err conftest.$ac_ext
-@@ -6625,26 +7360,43 @@
- echo "${ECHO_T}$ac_header_preproc" >&6
- 
- # So?  What about this header?
--case $ac_header_compiler:$ac_header_preproc in
--  yes:no )
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-     { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
--  no:yes )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-     { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
- echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## --------------------------------------------- ##
-+## Report this to lex-help at lists.sourceforge.net ##
-+## --------------------------------------------- ##
-+_ASBOX
-+    ) |
-+      sed "s/^/$as_me: WARNING:     /" >&2
-+    ;;
- esac
- echo "$as_me:$LINENO: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  eval "$as_ac_Header=$ac_header_preproc"
-+  eval "$as_ac_Header=\$ac_header_preproc"
- fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-@@ -6667,8 +7419,11 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- $ac_includes_default
- int
- main ()
-@@ -6683,11 +7438,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -6696,10 +7460,11 @@
-   ac_cv_type_size_t=yes
- else
-   echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_type_size_t=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
- echo "${ECHO_T}$ac_cv_type_size_t" >&6
-@@ -6721,8 +7486,11 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- $ac_includes_default
- int
- main ()
-@@ -6737,11 +7505,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -6750,10 +7527,11 @@
-   ac_cv_have_decl___func__=yes
- else
-   echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_have_decl___func__=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_have_decl___func__" >&5
- echo "${ECHO_T}$ac_cv_have_decl___func__" >&6
-@@ -6805,13 +7583,13 @@
-       # `set' does not quote correctly, so add quotes (double-quote
-       # substitution turns \\\\ into \\, and sed turns \\ into \).
-       sed -n \
--        "s/'/'\\\\''/g;
--    	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-+	"s/'/'\\\\''/g;
-+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-       ;;
-     *)
-       # `set' quotes correctly as required by POSIX, so do not add quotes.
-       sed -n \
--        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-+	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-       ;;
-     esac;
- } |
-@@ -6822,7 +7600,7 @@
-      t end
-      /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-      : end' >>confcache
--if cmp -s $cache_file confcache; then :; else
-+if diff $cache_file confcache >/dev/null 2>&1; then :; else
-   if test -w $cache_file; then
-     test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-     cat confcache >$cache_file
-@@ -6841,13 +7619,13 @@
- # trailing colons and then remove the whole line if VPATH becomes empty
- # (actually we leave an empty line to preserve line numbers).
- if test "x$srcdir" = x.; then
--  ac_vpsub='/^[ 	]*VPATH[ 	]*=/{
-+  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
- s/:*\$(srcdir):*/:/;
- s/:*\${srcdir}:*/:/;
- s/:*@srcdir@:*/:/;
--s/^\([^=]*=[ 	]*\):*/\1/;
-+s/^\([^=]*=[	 ]*\):*/\1/;
- s/:*$//;
--s/^[^=]*=[ 	]*$//;
-+s/^[^=]*=[	 ]*$//;
- }'
- fi
- 
-@@ -6858,7 +7636,7 @@
- for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-   # 1. Remove the extension, and $U if already installed.
-   ac_i=`echo "$ac_i" |
--         sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-+	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-   # 2. Add them.
-   ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-   ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
-@@ -6868,6 +7646,13 @@
- LTLIBOBJS=$ac_ltlibobjs
- 
- 
-+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
- if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-   { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
-@@ -6910,6 +7695,8 @@
- # configure, is in config.log if it exists.
- 
- debug=false
-+ac_cs_recheck=false
-+ac_cs_silent=false
- SHELL=\${CONFIG_SHELL-$SHELL}
- _ACEOF
- 
-@@ -6928,9 +7715,10 @@
- elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-   set -o posix
- fi
-+DUALCASE=1; export DUALCASE # for MKS sh
- 
- # Support unset when possible.
--if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
-+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-   as_unset=unset
- else
-   as_unset=false
-@@ -6944,9 +7732,12 @@
- PS4='+ '
- 
- # NLS nuisances.
--for as_var in LANG LANGUAGE LC_ALL LC_COLLATE LC_CTYPE LC_NUMERIC LC_MESSAGES LC_TIME
-+for as_var in \
-+  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-+  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-+  LC_TELEPHONE LC_TIME
- do
--  if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
-+  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-     eval $as_var=C; export $as_var
-   else
-     $as_unset $as_var
-@@ -6990,15 +7781,15 @@
- 
- # The user is always right.
- if test "${PATH_SEPARATOR+set}" != set; then
--  echo "#! /bin/sh" >conftest.sh
--  echo  "exit 0"   >>conftest.sh
--  chmod +x conftest.sh
--  if (PATH="/nonexistent;."; conftest.sh) >/dev/null 2>&1; then
-+  echo "#! /bin/sh" >conf$$.sh
-+  echo  "exit 0"   >>conf$$.sh
-+  chmod +x conf$$.sh
-+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-     PATH_SEPARATOR=';'
-   else
-     PATH_SEPARATOR=:
-   fi
--  rm -f conftest.sh
-+  rm -f conf$$.sh
- fi
- 
- 
-@@ -7125,16 +7916,17 @@
- if mkdir -p . 2>/dev/null; then
-   as_mkdir_p=:
- else
-+  test -d ./-p && rmdir ./-p
-   as_mkdir_p=false
- fi
- 
- as_executable_p="test -f"
- 
- # Sed expression to map a string onto a valid CPP name.
--as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
-+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
- 
- # Sed expression to map a string onto a valid variable name.
--as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
-+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
- 
- 
- # IFS
-@@ -7161,7 +7953,7 @@
- cat >&5 <<_CSEOF
- 
- This file was extended by flex $as_me 2.5.31, which was
--generated by GNU Autoconf 2.54.  Invocation command line was
-+generated by GNU Autoconf 2.59.  Invocation command line was
- 
-   CONFIG_FILES    = $CONFIG_FILES
-   CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -7201,12 +7993,13 @@
- 
-   -h, --help       print this help, then exit
-   -V, --version    print version number, then exit
-+  -q, --quiet      do not print progress messages
-   -d, --debug      don't remove temporary files
-       --recheck    update $as_me by reconfiguring in the same conditions
-   --file=FILE[:TEMPLATE]
--                   instantiate the configuration file FILE
-+		   instantiate the configuration file FILE
-   --header=FILE[:TEMPLATE]
--                   instantiate the configuration header FILE
-+		   instantiate the configuration header FILE
- 
- Configuration files:
- $config_files
-@@ -7223,11 +8016,10 @@
- cat >>$CONFIG_STATUS <<_ACEOF
- ac_cs_version="\\
- flex config.status 2.5.31
--configured by $0, generated by GNU Autoconf 2.54,
-+configured by $0, generated by GNU Autoconf 2.59,
-   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
- 
--Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
--Free Software Foundation, Inc.
-+Copyright (C) 2003 Free Software Foundation, Inc.
- This config.status script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it."
- srcdir=$srcdir
-@@ -7260,12 +8052,9 @@
-   case $ac_option in
-   # Handling of the options.
- _ACEOF
--cat >>$CONFIG_STATUS <<_ACEOF
--  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
--    echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion"
--    exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;;
--_ACEOF
- cat >>$CONFIG_STATUS <<\_ACEOF
-+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-+    ac_cs_recheck=: ;;
-   --version | --vers* | -V )
-     echo "$ac_cs_version"; exit 0 ;;
-   --he | --h)
-@@ -7287,6 +8076,9 @@
-     $ac_shift
-     CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-     ac_need_defaults=false;;
-+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-+    ac_cs_silent=: ;;
- 
-   # This is an error.
-   -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-@@ -7301,6 +8093,20 @@
-   shift
- done
- 
-+ac_configure_extra_args=
-+
-+if $ac_cs_silent; then
-+  exec 6>/dev/null
-+  ac_configure_extra_args="$ac_configure_extra_args --silent"
-+fi
-+
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF
-+if \$ac_cs_recheck; then
-+  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-+  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-+fi
-+
- _ACEOF
- 
- cat >>$CONFIG_STATUS <<_ACEOF
-@@ -7394,6 +8200,9 @@
-   test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
- fi
- 
-+# Have a temporary directory for convenience.  Make it in the build tree
-+# simply because there is no reason to put it here, and in addition,
-+# creating and moving files from /tmp can sometimes cause problems.
- # Create a temporary directory, and hook for its removal unless debugging.
- $debug ||
- {
-@@ -7402,17 +8211,17 @@
- }
- 
- # Create a (secure) tmp directory for tmp files.
--: ${TMPDIR=/tmp}
-+
- {
--  tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` &&
-+  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
-   test -n "$tmp" && test -d "$tmp"
- }  ||
- {
--  tmp=$TMPDIR/cs$$-$RANDOM
-+  tmp=./confstat$$-$RANDOM
-   (umask 077 && mkdir $tmp)
- } ||
- {
--   echo "$me: cannot create a temporary directory in $TMPDIR" >&2
-+   echo "$me: cannot create a temporary directory in ." >&2
-    { (exit 1); exit 1; }
- }
- 
-@@ -7460,6 +8269,9 @@
- s, at ECHO_N@,$ECHO_N,;t t
- s, at ECHO_T@,$ECHO_T,;t t
- s, at LIBS@,$LIBS,;t t
-+s, at MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
-+s, at MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
-+s, at MAINT@,$MAINT,;t t
- s, at INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
- s, at INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
- s, at INSTALL_DATA@,$INSTALL_DATA,;t t
-@@ -7476,8 +8288,10 @@
- s, at STRIP@,$STRIP,;t t
- s, at ac_ct_STRIP@,$ac_ct_STRIP,;t t
- s, at INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
-+s, at mkdir_p@,$mkdir_p,;t t
- s, at AWK@,$AWK,;t t
- s, at SET_MAKE@,$SET_MAKE,;t t
-+s, at am__leading_dot@,$am__leading_dot,;t t
- s, at MKINSTALLDIRS@,$MKINSTALLDIRS,;t t
- s, at MSGFMT@,$MSGFMT,;t t
- s, at GMSGFMT@,$GMSGFMT,;t t
-@@ -7564,9 +8378,9 @@
-       (echo ':t
-   /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-       if test -z "$ac_sed_cmds"; then
--  	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-+	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-       else
--  	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-+	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-       fi
-       ac_sed_frag=`expr $ac_sed_frag + 1`
-       ac_beg=$ac_end
-@@ -7584,21 +8398,21 @@
-   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-   case $ac_file in
-   - | *:- | *:-:* ) # input from stdin
--        cat >$tmp/stdin
--        ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
--        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-+	cat >$tmp/stdin
-+	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-+	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-   *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
--        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-+	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-   * )   ac_file_in=$ac_file.in ;;
-   esac
- 
-   # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-   ac_dir=`(dirname "$ac_file") 2>/dev/null ||
- $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--         X"$ac_file" : 'X\(//\)[^/]' \| \
--         X"$ac_file" : 'X\(//\)$' \| \
--         X"$ac_file" : 'X\(/\)' \| \
--         .     : '\(.\)' 2>/dev/null ||
-+	 X"$ac_file" : 'X\(//\)[^/]' \| \
-+	 X"$ac_file" : 'X\(//\)$' \| \
-+	 X"$ac_file" : 'X\(/\)' \| \
-+	 .     : '\(.\)' 2>/dev/null ||
- echo X"$ac_file" |
-     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-@@ -7614,10 +8428,10 @@
-       as_dirs="$as_dir $as_dirs"
-       as_dir=`(dirname "$as_dir") 2>/dev/null ||
- $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--         X"$as_dir" : 'X\(//\)[^/]' \| \
--         X"$as_dir" : 'X\(//\)$' \| \
--         X"$as_dir" : 'X\(/\)' \| \
--         .     : '\(.\)' 2>/dev/null ||
-+	 X"$as_dir" : 'X\(//\)[^/]' \| \
-+	 X"$as_dir" : 'X\(//\)$' \| \
-+	 X"$as_dir" : 'X\(/\)' \| \
-+	 .     : '\(.\)' 2>/dev/null ||
- echo X"$as_dir" |
-     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-@@ -7655,12 +8469,45 @@
-     ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-     ac_top_srcdir=$ac_top_builddir$srcdir ;;
- esac
--# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
--# absolute.
--ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
--ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
--ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
--ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
-+
-+# Do not use `cd foo && pwd` to compute absolute paths, because
-+# the directories may not exist.
-+case `pwd` in
-+.) ac_abs_builddir="$ac_dir";;
-+*)
-+  case "$ac_dir" in
-+  .) ac_abs_builddir=`pwd`;;
-+  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-+  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-+  esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_top_builddir=${ac_top_builddir}.;;
-+*)
-+  case ${ac_top_builddir}. in
-+  .) ac_abs_top_builddir=$ac_abs_builddir;;
-+  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-+  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-+  esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_srcdir=$ac_srcdir;;
-+*)
-+  case $ac_srcdir in
-+  .) ac_abs_srcdir=$ac_abs_builddir;;
-+  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-+  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-+  esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_top_srcdir=$ac_top_srcdir;;
-+*)
-+  case $ac_top_srcdir in
-+  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-+  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-+  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-+  esac;;
-+esac
- 
- 
-   case $INSTALL in
-@@ -7668,11 +8515,6 @@
-   *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
-   esac
- 
--  if test x"$ac_file" != x-; then
--    { echo "$as_me:$LINENO: creating $ac_file" >&5
--echo "$as_me: creating $ac_file" >&6;}
--    rm -f "$ac_file"
--  fi
-   # Let's still pretend it is `configure' which instantiates (i.e., don't
-   # use $as_me), people would be surprised to read:
-   #    /* config.h.  Generated by config.status.  */
-@@ -7682,7 +8524,7 @@
-     configure_input="$ac_file.  "
-   fi
-   configure_input=$configure_input"Generated from `echo $ac_file_in |
--                                     sed 's,.*/,,'` by configure."
-+				     sed 's,.*/,,'` by configure."
- 
-   # First look for the input files in the build tree, otherwise in the
-   # src tree.
-@@ -7691,26 +8533,32 @@
-       case $f in
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
--         # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-+	 # Absolute (can't be DOS-style, as IFS=:)
-+	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
--         echo $f;;
-+	 echo "$f";;
-       *) # Relative
--         if test -f "$f"; then
--           # Build tree
--           echo $f
--         elif test -f "$srcdir/$f"; then
--           # Source tree
--           echo $srcdir/$f
--         else
--           # /dev/null tree
--           { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-+	 if test -f "$f"; then
-+	   # Build tree
-+	   echo "$f"
-+	 elif test -f "$srcdir/$f"; then
-+	   # Source tree
-+	   echo "$srcdir/$f"
-+	 else
-+	   # /dev/null tree
-+	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
--         fi;;
-+	 fi;;
-       esac
-     done` || { (exit 1); exit 1; }
-+
-+  if test x"$ac_file" != x-; then
-+    { echo "$as_me:$LINENO: creating $ac_file" >&5
-+echo "$as_me: creating $ac_file" >&6;}
-+    rm -f "$ac_file"
-+  fi
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
-   sed "$ac_vpsub
-@@ -7750,12 +8598,12 @@
- # NAME is the cpp macro being defined and VALUE is the value it is being given.
- #
- # ac_d sets the value in "#define NAME VALUE" lines.
--ac_dA='s,^\([ 	]*\)#\([ 	]*define[ 	][ 	]*\)'
--ac_dB='[ 	].*$,\1#\2'
-+ac_dA='s,^\([	 ]*\)#\([	 ]*define[	 ][	 ]*\)'
-+ac_dB='[	 ].*$,\1#\2'
- ac_dC=' '
- ac_dD=',;t'
- # ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
--ac_uA='s,^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
-+ac_uA='s,^\([	 ]*\)#\([	 ]*\)undef\([	 ][	 ]*\)'
- ac_uB='$,\1#\2define\3'
- ac_uC=' '
- ac_uD=',;t'
-@@ -7764,11 +8612,11 @@
-   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-   case $ac_file in
-   - | *:- | *:-:* ) # input from stdin
--        cat >$tmp/stdin
--        ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
--        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-+	cat >$tmp/stdin
-+	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-+	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-   *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
--        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-+	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-   * )   ac_file_in=$ac_file.in ;;
-   esac
- 
-@@ -7782,28 +8630,29 @@
-       case $f in
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
--         # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-+	 # Absolute (can't be DOS-style, as IFS=:)
-+	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
--         echo $f;;
-+	 # Do quote $f, to prevent DOS paths from being IFS'd.
-+	 echo "$f";;
-       *) # Relative
--         if test -f "$f"; then
--           # Build tree
--           echo $f
--         elif test -f "$srcdir/$f"; then
--           # Source tree
--           echo $srcdir/$f
--         else
--           # /dev/null tree
--           { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-+	 if test -f "$f"; then
-+	   # Build tree
-+	   echo "$f"
-+	 elif test -f "$srcdir/$f"; then
-+	   # Source tree
-+	   echo "$srcdir/$f"
-+	 else
-+	   # /dev/null tree
-+	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
--         fi;;
-+	 fi;;
-       esac
-     done` || { (exit 1); exit 1; }
-   # Remove the trailing spaces.
--  sed 's/[ 	]*$//' $ac_file_inputs >$tmp/in
-+  sed 's/[	 ]*$//' $ac_file_inputs >$tmp/in
- 
- _ACEOF
- 
-@@ -7826,9 +8675,9 @@
- s,[\\$`],\\&,g
- t clear
- : clear
--s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	(][^ 	(]*\)\(([^)]*)\)[ 	]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
-+s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*\)\(([^)]*)\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
- t end
--s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	][^ 	]*\)[ 	]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
-+s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
- : end
- _ACEOF
- # If some macros were called several times there might be several times
-@@ -7842,13 +8691,13 @@
- # example, in the case of _POSIX_SOURCE, which is predefined and required
- # on some systems where configure will not decide to define it.
- cat >>conftest.undefs <<\_ACEOF
--s,^[ 	]*#[ 	]*undef[ 	][ 	]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
-+s,^[	 ]*#[	 ]*undef[	 ][	 ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
- _ACEOF
- 
- # Break up conftest.defines because some shells have a limit on the size
- # of here documents, and old seds have small limits too (100 cmds).
- echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
--echo '  if grep "^[ 	]*#[ 	]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
-+echo '  if grep "^[	 ]*#[	 ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
- echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
- echo '  :' >>$CONFIG_STATUS
- rm -f conftest.tail
-@@ -7857,7 +8706,7 @@
-   # Write a limited-size here document to $tmp/defines.sed.
-   echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
-   # Speed up: don't consider the non `#define' lines.
--  echo '/^[ 	]*#[ 	]*define/!b' >>$CONFIG_STATUS
-+  echo '/^[	 ]*#[	 ]*define/!b' >>$CONFIG_STATUS
-   # Work around the forget-to-reset-the-flag bug.
-   echo 't clr' >>$CONFIG_STATUS
-   echo ': clr' >>$CONFIG_STATUS
-@@ -7884,7 +8733,7 @@
-   # Write a limited-size here document to $tmp/undefs.sed.
-   echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
-   # Speed up: don't consider the non `#undef'
--  echo '/^[ 	]*#[ 	]*undef/!b' >>$CONFIG_STATUS
-+  echo '/^[	 ]*#[	 ]*undef/!b' >>$CONFIG_STATUS
-   # Work around the forget-to-reset-the-flag bug.
-   echo 't clr' >>$CONFIG_STATUS
-   echo ': clr' >>$CONFIG_STATUS
-@@ -7912,16 +8761,16 @@
-   cat $tmp/in >>$tmp/config.h
-   rm -f $tmp/in
-   if test x"$ac_file" != x-; then
--    if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
-+    if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
-       { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
- echo "$as_me: $ac_file is unchanged" >&6;}
-     else
-       ac_dir=`(dirname "$ac_file") 2>/dev/null ||
- $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--         X"$ac_file" : 'X\(//\)[^/]' \| \
--         X"$ac_file" : 'X\(//\)$' \| \
--         X"$ac_file" : 'X\(/\)' \| \
--         .     : '\(.\)' 2>/dev/null ||
-+	 X"$ac_file" : 'X\(//\)[^/]' \| \
-+	 X"$ac_file" : 'X\(//\)$' \| \
-+	 X"$ac_file" : 'X\(/\)' \| \
-+	 .     : '\(.\)' 2>/dev/null ||
- echo X"$ac_file" |
-     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-@@ -7937,10 +8786,10 @@
-       as_dirs="$as_dir $as_dirs"
-       as_dir=`(dirname "$as_dir") 2>/dev/null ||
- $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--         X"$as_dir" : 'X\(//\)[^/]' \| \
--         X"$as_dir" : 'X\(//\)$' \| \
--         X"$as_dir" : 'X\(/\)' \| \
--         .     : '\(.\)' 2>/dev/null ||
-+	 X"$as_dir" : 'X\(//\)[^/]' \| \
-+	 X"$as_dir" : 'X\(//\)$' \| \
-+	 X"$as_dir" : 'X\(/\)' \| \
-+	 .     : '\(.\)' 2>/dev/null ||
- echo X"$as_dir" |
-     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-@@ -7960,13 +8809,22 @@
-     cat $tmp/config.h
-     rm -f $tmp/config.h
-   fi
--_am_stamp_count=`expr ${_am_stamp_count-0} + 1`
-+# Compute $ac_file's index in $config_headers.
-+_am_stamp_count=1
-+for _am_header in $config_headers :; do
-+  case $_am_header in
-+    $ac_file | $ac_file:* )
-+      break ;;
-+    * )
-+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-+  esac
-+done
- echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
- $as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--         X$ac_file : 'X\(//\)[^/]' \| \
--         X$ac_file : 'X\(//\)$' \| \
--         X$ac_file : 'X\(/\)' \| \
--         .     : '\(.\)' 2>/dev/null ||
-+	 X$ac_file : 'X\(//\)[^/]' \| \
-+	 X$ac_file : 'X\(//\)$' \| \
-+	 X$ac_file : 'X\(/\)' \| \
-+	 .     : '\(.\)' 2>/dev/null ||
- echo X$ac_file |
-     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-@@ -7985,16 +8843,41 @@
-   ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
-   ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
- $as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--         X"$ac_dest" : 'X\(//\)[^/]' \| \
--         X"$ac_dest" : 'X\(//\)$' \| \
--         X"$ac_dest" : 'X\(/\)' \| \
--         .     : '\(.\)' 2>/dev/null ||
-+	 X"$ac_dest" : 'X\(//\)[^/]' \| \
-+	 X"$ac_dest" : 'X\(//\)$' \| \
-+	 X"$ac_dest" : 'X\(/\)' \| \
-+	 .     : '\(.\)' 2>/dev/null ||
- echo X"$ac_dest" |
-     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-   	  /^X\(\/\/\)$/{ s//\1/; q; }
-   	  /^X\(\/\).*/{ s//\1/; q; }
-   	  s/.*/./; q'`
-+  { if $as_mkdir_p; then
-+    mkdir -p "$ac_dir"
-+  else
-+    as_dir="$ac_dir"
-+    as_dirs=
-+    while test ! -d "$as_dir"; do
-+      as_dirs="$as_dir $as_dirs"
-+      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$as_dir" : 'X\(//\)[^/]' \| \
-+	 X"$as_dir" : 'X\(//\)$' \| \
-+	 X"$as_dir" : 'X\(/\)' \| \
-+	 .     : '\(.\)' 2>/dev/null ||
-+echo X"$as_dir" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+  	  /^X\(\/\/\)$/{ s//\1/; q; }
-+  	  /^X\(\/\).*/{ s//\1/; q; }
-+  	  s/.*/./; q'`
-+    done
-+    test ! -n "$as_dirs" || mkdir $as_dirs
-+  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-+   { (exit 1); exit 1; }; }; }
-+
-   ac_builddir=.
- 
- if test "$ac_dir" != .; then
-@@ -8020,12 +8903,45 @@
-     ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-     ac_top_srcdir=$ac_top_builddir$srcdir ;;
- esac
--# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
--# absolute.
--ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
--ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
--ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
--ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
-+
-+# Do not use `cd foo && pwd` to compute absolute paths, because
-+# the directories may not exist.
-+case `pwd` in
-+.) ac_abs_builddir="$ac_dir";;
-+*)
-+  case "$ac_dir" in
-+  .) ac_abs_builddir=`pwd`;;
-+  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-+  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-+  esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_top_builddir=${ac_top_builddir}.;;
-+*)
-+  case ${ac_top_builddir}. in
-+  .) ac_abs_top_builddir=$ac_abs_builddir;;
-+  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-+  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-+  esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_srcdir=$ac_srcdir;;
-+*)
-+  case $ac_srcdir in
-+  .) ac_abs_srcdir=$ac_abs_builddir;;
-+  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-+  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-+  esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_top_srcdir=$ac_top_srcdir;;
-+*)
-+  case $ac_top_srcdir in
-+  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-+  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-+  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-+  esac;;
-+esac
- 
- 
-   { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
-@@ -8139,10 +9055,10 @@
-   if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-     dirpart=`(dirname "$mf") 2>/dev/null ||
- $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--         X"$mf" : 'X\(//\)[^/]' \| \
--         X"$mf" : 'X\(//\)$' \| \
--         X"$mf" : 'X\(/\)' \| \
--         .     : '\(.\)' 2>/dev/null ||
-+	 X"$mf" : 'X\(//\)[^/]' \| \
-+	 X"$mf" : 'X\(//\)$' \| \
-+	 X"$mf" : 'X\(/\)' \| \
-+	 .     : '\(.\)' 2>/dev/null ||
- echo X"$mf" |
-     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-@@ -8155,14 +9071,14 @@
-   grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
-   # Extract the definition of DEP_FILES from the Makefile without
-   # running `make'.
--  DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
-+  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-   test -z "$DEPDIR" && continue
-   # When using ansi2knr, U may be empty or an underscore; expand it
--  U=`sed -n -e '/^U = / s///p' < "$mf"`
-+  U=`sed -n 's/^U = //p' < "$mf"`
-   test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
-   # We invoke sed twice because it is the simplest approach to
-   # changing $(DEPDIR) to its actual value in the expansion.
--  for file in `sed -n -e '
-+  for file in `sed -n '
-     /^DEP_FILES = .*\\\\$/ {
-       s/^DEP_FILES = //
-       :loop
-@@ -8178,10 +9094,10 @@
-     test -f "$dirpart/$file" && continue
-     fdir=`(dirname "$file") 2>/dev/null ||
- $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--         X"$file" : 'X\(//\)[^/]' \| \
--         X"$file" : 'X\(//\)$' \| \
--         X"$file" : 'X\(/\)' \| \
--         .     : '\(.\)' 2>/dev/null ||
-+	 X"$file" : 'X\(//\)[^/]' \| \
-+	 X"$file" : 'X\(//\)$' \| \
-+	 X"$file" : 'X\(/\)' \| \
-+	 .     : '\(.\)' 2>/dev/null ||
- echo X"$file" |
-     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-@@ -8197,10 +9113,10 @@
-       as_dirs="$as_dir $as_dirs"
-       as_dir=`(dirname "$as_dir") 2>/dev/null ||
- $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--         X"$as_dir" : 'X\(//\)[^/]' \| \
--         X"$as_dir" : 'X\(//\)$' \| \
--         X"$as_dir" : 'X\(/\)' \| \
--         .     : '\(.\)' 2>/dev/null ||
-+	 X"$as_dir" : 'X\(//\)[^/]' \| \
-+	 X"$as_dir" : 'X\(//\)$' \| \
-+	 X"$as_dir" : 'X\(/\)' \| \
-+	 .     : '\(.\)' 2>/dev/null ||
- echo X"$as_dir" |
-     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-@@ -8240,8 +9156,11 @@
- # need to make the FD available again.
- if test "$no_create" != yes; then
-   ac_cs_success=:
-+  ac_config_status_args=
-+  test "$silent" = yes &&
-+    ac_config_status_args="$ac_config_status_args --quiet"
-   exec 5>/dev/null
--  $SHELL $CONFIG_STATUS || ac_cs_success=false
-+  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-   exec 5>>config.log
-   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-   # would make configure fail if this is the last instruction.
-diff -Naur flex-2.5.31.orig/configure.in flex-2.5.31/configure.in
---- flex-2.5.31.orig/configure.in	2003-04-01 16:17:51.000000000 +0000
-+++ flex-2.5.31/configure.in	2005-01-08 07:43:01.492954152 +0000
-@@ -25,6 +25,7 @@
- 
- AC_PREREQ(2.54)
- AC_INIT(flex,2.5.31,lex-help at lists.sourceforge.net)
-+AM_MAINTAINER_MODE
- AC_CONFIG_SRCDIR(scan.l)
- AM_INIT_AUTOMAKE
- AC_CONFIG_HEADER(config.h:conf.in)
-@@ -48,7 +49,7 @@
- dnl if INDENT is set to 'indent' then we didn't find indent
- if test "$INDENT" != indent ; then
-    AC_MSG_CHECKING(if $INDENT is GNU indent)
--   if $INDENT --version 2>/dev/null | head -1|grep "GNU indent" > /dev/null ; then
-+   if $INDENT --version 2>/dev/null | head -n 1|grep "GNU indent" > /dev/null ; then
-       AC_MSG_RESULT(yes)
-    else
-       AC_MSG_RESULT(no)
-diff -Naur flex-2.5.31.orig/depcomp flex-2.5.31/depcomp
---- flex-2.5.31.orig/depcomp	2003-04-01 16:32:34.000000000 +0000
-+++ flex-2.5.31/depcomp	2005-01-08 07:43:01.498953240 +0000
-@@ -1,7 +1,7 @@
- #! /bin/sh
- 
- # depcomp - compile a program generating dependencies as side-effects
--# Copyright 1999, 2000 Free Software Foundation, Inc.
-+# Copyright 1999, 2000, 2003 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
-@@ -172,19 +172,25 @@
- 
- aix)
-   # The C for AIX Compiler uses -M and outputs the dependencies
--  # in a .u file.  This file always lives in the current directory.
--  # Also, the AIX compiler puts `$object:' at the start of each line;
--  # $object doesn't have directory information.
--  stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'`
-+  # in a .u file.  In older versions, this file always lives in the
-+  # current directory.  Also, the AIX compiler puts `$object:' at the
-+  # start of each line; $object doesn't have directory information.
-+  # Version 6 uses the directory in both cases.
-+  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
-   tmpdepfile="$stripped.u"
--  outname="$stripped.o"
-   if test "$libtool" = yes; then
-     "$@" -Wc,-M
-   else
-     "$@" -M
-   fi
--
-   stat=$?
-+
-+  if test -f "$tmpdepfile"; then :
-+  else
-+    stripped=`echo "$stripped" | sed 's,^.*/,,'`
-+    tmpdepfile="$stripped.u"
-+  fi
-+
-   if test $stat -eq 0; then :
-   else
-     rm -f "$tmpdepfile"
-@@ -192,6 +198,7 @@
-   fi
- 
-   if test -f "$tmpdepfile"; then
-+    outname="$stripped.o"
-     # Each line is of the form `foo.o: dependent.h'.
-     # Do two passes, one to just change these to
-     # `$object: dependent.h' and one to simply `dependent.h:'.
-@@ -206,6 +213,44 @@
-   rm -f "$tmpdepfile"
-   ;;
- 
-+icc)
-+  # Intel's C compiler understands `-MD -MF file'.  However on
-+  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-+  # ICC 7.0 will fill foo.d with something like
-+  #    foo.o: sub/foo.c
-+  #    foo.o: sub/foo.h
-+  # which is wrong.  We want:
-+  #    sub/foo.o: sub/foo.c
-+  #    sub/foo.o: sub/foo.h
-+  #    sub/foo.c:
-+  #    sub/foo.h:
-+  # ICC 7.1 will output
-+  #    foo.o: sub/foo.c sub/foo.h
-+  # and will wrap long lines using \ :
-+  #    foo.o: sub/foo.c ... \
-+  #     sub/foo.h ... \
-+  #     ...
-+
-+  "$@" -MD -MF "$tmpdepfile"
-+  stat=$?
-+  if test $stat -eq 0; then :
-+  else
-+    rm -f "$tmpdepfile"
-+    exit $stat
-+  fi
-+  rm -f "$depfile"
-+  # Each line is of the form `foo.o: dependent.h',
-+  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
-+  # Do two passes, one to just change these to
-+  # `$object: dependent.h' and one to simply `dependent.h:'.
-+  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-+  # Some versions of the HPUX 10.20 sed can't process this invocation
-+  # correctly.  Breaking it into two sed invocations is a workaround.
-+  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-+    sed -e 's/$/ :/' >> "$depfile"
-+  rm -f "$tmpdepfile"
-+  ;;
-+
- tru64)
-    # The Tru64 compiler uses -MD to generate dependencies as a side
-    # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-@@ -240,7 +285,7 @@
-    fi
-    if test -f "$tmpdepfile"; then
-       sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
--      # That's a space and a tab in the [].
-+      # That's a tab and a space in the [].
-       sed -e 's,^.*\.[a-z]*:[ 	]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-    else
-       echo "#dummy" > "$depfile"
-@@ -254,7 +299,7 @@
- 
- dashmstdout)
-   # Important note: in order to support this mode, a compiler *must*
--  # always write the proprocessed file to stdout, regardless of -o.
-+  # always write the preprocessed file to stdout, regardless of -o.
-   "$@" || exit $?
- 
-   # Remove the call to Libtool.
-@@ -265,9 +310,7 @@
-     shift
-   fi
- 
--  # Remove `-o $object'.  We will use -o /dev/null later,
--  # however we can't do the remplacement now because
--  # `-o $object' might simply not be used
-+  # Remove `-o $object'.
-   IFS=" "
-   for arg
-   do
-@@ -287,7 +330,11 @@
-   done
- 
-   test -z "$dashmflag" && dashmflag=-M
--  "$@" -o /dev/null $dashmflag | sed 's:^[^:]*\:[ 	]*:'"$object"'\: :' > "$tmpdepfile"
-+  # Require at least two characters before searching for `:'
-+  # in the target name.  This is to cope with DOS-style filenames:
-+  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
-+  "$@" $dashmflag |
-+    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
-   rm -f "$depfile"
-   cat < "$tmpdepfile" > "$depfile"
-   tr ' ' '
-@@ -306,6 +353,13 @@
- 
- makedepend)
-   "$@" || exit $?
-+  # Remove any Libtool call
-+  if test "$libtool" = yes; then
-+    while test $1 != '--mode=compile'; do
-+      shift
-+    done
-+    shift
-+  fi
-   # X makedepend
-   shift
-   cleared=no
-@@ -318,7 +372,9 @@
-     case "$arg" in
-     -D*|-I*)
-       set fnord "$@" "$arg"; shift ;;
--    -*)
-+    # Strip any option that makedepend may not understand.  Remove
-+    # the object too, otherwise makedepend will parse it as a source file.
-+    -*|$object)
-       ;;
-     *)
-       set fnord "$@" "$arg"; shift ;;
-@@ -339,7 +395,7 @@
- 
- cpp)
-   # Important note: in order to support this mode, a compiler *must*
--  # always write the proprocessed file to stdout.
-+  # always write the preprocessed file to stdout.
-   "$@" || exit $?
- 
-   # Remove the call to Libtool.
-@@ -381,7 +437,7 @@
- 
- msvisualcpp)
-   # Important note: in order to support this mode, a compiler *must*
--  # always write the proprocessed file to stdout, regardless of -o,
-+  # always write the preprocessed file to stdout, regardless of -o,
-   # because we must use -o when running libtool.
-   "$@" || exit $?
-   IFS=" "
-diff -Naur flex-2.5.31.orig/doc/Makefile.am flex-2.5.31/doc/Makefile.am
---- flex-2.5.31.orig/doc/Makefile.am	2003-03-26 19:04:07.000000000 +0000
-+++ flex-2.5.31/doc/Makefile.am	2005-01-08 07:43:01.521949744 +0000
-@@ -13,7 +13,7 @@
- EXTRA_DIST = \
- 	$(man_MANS)
- 
--$(man_MANS): $(top_srcdir)/main.c
--	for i in $(man_MANS) ; do \
--	$(help2man) --name='fast lexical analyzer generator' --section=`echo $$i|rev|cut -f 1 -d .|rev` ../flex > $$i ; \
--	done
-+ at MAINTAINER_MODE_TRUE@$(man_MANS): $(top_srcdir)/main.c
-+ at MAINTAINER_MODE_TRUE@	for i in $(man_MANS) ; do \
-+ at MAINTAINER_MODE_TRUE@	$(help2man) --name='fast lexical analyzer generator' --section=`echo $$i|rev|cut -f 1 -d .|rev` ../flex > $$i ; \
-+ at MAINTAINER_MODE_TRUE@	done
-diff -Naur flex-2.5.31.orig/doc/Makefile.in flex-2.5.31/doc/Makefile.in
---- flex-2.5.31.orig/doc/Makefile.in	2003-04-01 16:32:35.000000000 +0000
-+++ flex-2.5.31/doc/Makefile.in	2005-01-08 07:43:01.530948376 +0000
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.7 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # @configure_input@
- 
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -13,7 +13,6 @@
- # PARTICULAR PURPOSE.
- 
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -21,7 +20,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -36,6 +34,39 @@
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
- host_triplet = @host@
-+subdir = doc
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-+	$(srcdir)/stamp-vti $(srcdir)/version.texi mdate-sh \
-+	texinfo.tex
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
-+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+INFO_DEPS = $(srcdir)/flex.info
-+am__TEXINFO_TEX_DIR = $(srcdir)
-+DVIS = flex.dvi
-+PDFS = flex.pdf
-+PSS = flex.ps
-+HTMLS = flex.html
-+TEXINFOS = flex.texi
-+TEXI2DVI = texi2dvi
-+TEXI2PDF = $(TEXI2DVI) --pdf --batch
-+MAKEINFOHTML = $(MAKEINFO) --html
-+AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS)
-+DVIPS = dvips
-+am__installdirs = "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)"
-+man1dir = $(mandir)/man1
-+NROFF = nroff
-+MANS = $(man_MANS)
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -75,12 +106,16 @@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
- LIBICONV = @LIBICONV@
- LIBINTL = @LIBINTL@
-+LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LN_S = @LN_S@
- LTLIBICONV = @LTLIBICONV@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- M4 = @M4@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
-@@ -111,6 +146,7 @@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
- am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
- bindir = @bindir@
- build = @build@
-@@ -132,6 +168,7 @@
- libexecdir = @libexecdir@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-@@ -140,113 +177,147 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- help2man = @HELP2MAN@
--
- info_TEXINFOS = flex.texi
- man_MANS = flex.1
--
- MAINTAINERCLEANFILES = \
- 	flex.1
- 
--
- CLEANFILES = \
- 	flex.hks \
- 	flex.ops
- 
--
- EXTRA_DIST = \
- 	$(man_MANS)
- 
--subdir = doc
--mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--am__TEXINFO_TEX_DIR = $(srcdir)
--INFO_DEPS = flex.info
--DVIS = flex.dvi
--PDFS = flex.pdf
--PSS = flex.ps
--TEXINFOS = flex.texi
--
--NROFF = nroff
--MANS = $(man_MANS)
--DIST_COMMON = Makefile.am Makefile.in mdate-sh stamp-vti texinfo.tex \
--	version.texi
- all: all-am
- 
- .SUFFIXES:
--.SUFFIXES: .dvi .info .pdf .ps .texi
--$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+.SUFFIXES: .dvi .html .info .pdf .ps .texi
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/Makefile'; \
- 	cd $(top_srcdir) && \
- 	  $(AUTOMAKE) --gnu  doc/Makefile
--Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- .texi.info:
--	@rm -f $@ $@-[0-9] $@-[0-9][0-9]
--	$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
--	`test -f '$<' || echo '$(srcdir)/'`$< -o $@
-+	restore=: && \
-+	backupdir="$(am__leading_dot)am$$$$" && \
-+	am__cwd=`pwd` && cd $(srcdir) && \
-+	rm -rf $$backupdir && mkdir $$backupdir && \
-+	for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \
-+	  if test -f $$f; then \
-+	    mv $$f $$backupdir; \
-+	    restore=mv; \
-+	  fi; \
-+	done; \
-+	cd "$$am__cwd"; \
-+	if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
-+	 -o $@ $<; \
-+	then \
-+	  rc=0; \
-+	  cd $(srcdir); \
-+	else \
-+	  rc=$$?; \
-+	  cd $(srcdir) && \
-+	  $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \
-+	fi; \
-+	rm -rf $$backupdir; \
-+	exit $$rc
- 
- .texi.dvi:
- 	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
- 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
--	$(TEXI2DVI) `test -f '$<' || echo '$(srcdir)/'`$<
-+	$(TEXI2DVI) $<
- 
- .texi.pdf:
- 	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
- 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
--	$(TEXI2PDF) `test -f '$<' || echo '$(srcdir)/'`$<
--flex.info: flex.texi version.texi
--flex.dvi: flex.texi version.texi
--flex.pdf: flex.texi version.texi
--version.texi:  stamp-vti
--stamp-vti: flex.texi $(top_srcdir)/configure.in
-+	$(TEXI2PDF) $<
-+
-+.texi.html:
-+	$(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
-+	 -o $@ $<
-+	if test ! -d $@ && test -d $(@:.html=); then \
-+	  mv $(@:.html=) $@; else :; fi
-+$(srcdir)/flex.info: flex.texi $(srcdir)/version.texi
-+flex.dvi: flex.texi $(srcdir)/version.texi
-+flex.pdf: flex.texi $(srcdir)/version.texi
-+flex.html: flex.texi $(srcdir)/version.texi
-+$(srcdir)/version.texi: @MAINTAINER_MODE_TRUE@ $(srcdir)/stamp-vti
-+$(srcdir)/stamp-vti: flex.texi $(top_srcdir)/configure
- 	@(dir=.; test -f ./flex.texi || dir=$(srcdir); \
- 	set `$(SHELL) $(srcdir)/mdate-sh $$dir/flex.texi`; \
- 	echo "@set UPDATED $$1 $$2 $$3"; \
- 	echo "@set UPDATED-MONTH $$2 $$3"; \
- 	echo "@set EDITION $(VERSION)"; \
- 	echo "@set VERSION $(VERSION)") > vti.tmp
--	@cmp -s vti.tmp version.texi \
--	  || (echo "Updating version.texi"; \
--	      cp vti.tmp version.texi)
-+	@cmp -s vti.tmp $(srcdir)/version.texi \
-+	  || (echo "Updating $(srcdir)/version.texi"; \
-+	      cp vti.tmp $(srcdir)/version.texi)
- 	- at rm -f vti.tmp
--	@cp version.texi $@
-+	@cp $(srcdir)/version.texi $@
- 
- mostlyclean-vti:
- 	-rm -f vti.tmp
- 
- maintainer-clean-vti:
--	-rm -f stamp-vti version.texi
--TEXI2DVI = texi2dvi
--
--TEXI2PDF = $(TEXI2DVI) --pdf --batch
--DVIPS = dvips
-+ at MAINTAINER_MODE_TRUE@	-rm -f $(srcdir)/stamp-vti $(srcdir)/version.texi
- .dvi.ps:
--	$(DVIPS) $< -o $@
-+	$(DVIPS) -o $@ $<
- 
- uninstall-info-am:
- 	$(PRE_UNINSTALL)
- 	@if (install-info --version && \
--	     install-info --version | grep -i -v debian) >/dev/null 2>&1; then \
-+	     install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
- 	  list='$(INFO_DEPS)'; \
- 	  for file in $$list; do \
--	    echo " install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$file"; \
--	    install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$file; \
-+	    relfile=`echo "$$file" | sed 's|^.*/||'`; \
-+	    echo " install-info --info-dir='$(DESTDIR)$(infodir)' --remove '$(DESTDIR)$(infodir)/$$relfile'"; \
-+	    install-info --info-dir="$(DESTDIR)$(infodir)" --remove "$(DESTDIR)$(infodir)/$$relfile"; \
- 	  done; \
- 	else :; fi
- 	@$(NORMAL_UNINSTALL)
- 	@list='$(INFO_DEPS)'; \
- 	for file in $$list; do \
--	  (if cd $(DESTDIR)$(infodir); then \
--	     echo " rm -f $$file $$file-[0-9] $$file-[0-9][0-9])"; \
--	     rm -f $$file $$file-[0-9] $$file-[0-9][0-9]; \
-+	  relfile=`echo "$$file" | sed 's|^.*/||'`; \
-+	  relfile_i=`echo "$$relfile" | sed 's|\.info$$||;s|$$|.i|'`; \
-+	  (if cd "$(DESTDIR)$(infodir)"; then \
-+	     echo " rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9])"; \
-+	     rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]; \
- 	   else :; fi); \
- 	done
- 
- dist-info: $(INFO_DEPS)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- 	list='$(INFO_DEPS)'; \
- 	for base in $$list; do \
-+	  case $$base in \
-+	    $(srcdir)/*) base=`echo "$$base" | sed "s|^$$srcdirstrip/||"`;; \
-+	  esac; \
- 	  if test -f $$base; then d=.; else d=$(srcdir); fi; \
- 	  for file in $$d/$$base*; do \
- 	    relfile=`expr "$$file" : "$$d/\(.*\)"`; \
-@@ -256,22 +327,20 @@
- 	done
- 
- mostlyclean-aminfo:
--	-rm -f flex.aux flex.cp flex.cps flex.fn flex.fns flex.hk flex.ky flex.log \
--	  flex.op flex.pg flex.tmp flex.toc flex.tp flex.tps flex.vr \
--	  flex.vrs flex.dvi flex.pdf flex.ps
-+	-rm -rf flex.aux flex.cp flex.cps flex.fn flex.fns flex.hk flex.hks flex.ky \
-+	  flex.kys flex.log flex.op flex.ops flex.pg flex.pgs flex.tmp \
-+	  flex.toc flex.tp flex.tps flex.vr flex.vrs flex.dvi flex.pdf \
-+	  flex.ps flex.html
- 
- maintainer-clean-aminfo:
--	list='$(INFO_DEPS)'; for i in $$list; do \
--	  rm -f $$i; \
--	  if test "`echo $$i-[0-9]*`" != "$$i-[0-9]*"; then \
--	    rm -f $$i-[0-9]*; \
--	  fi; \
-+	@list='$(INFO_DEPS)'; for i in $$list; do \
-+	  i_i=`echo "$$i" | sed 's|\.info$$||;s|$$|.i|'`; \
-+	  echo " rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]"; \
-+	  rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]; \
- 	done
--
--man1dir = $(mandir)/man1
- install-man1: $(man1_MANS) $(man_MANS)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(man1dir)
-+	test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
- 	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- 	for i in $$l2; do \
-@@ -290,8 +359,8 @@
- 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
- 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
- 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
--	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
--	  $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
-+	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
-+	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
- 	done
- uninstall-man1:
- 	@$(NORMAL_UNINSTALL)
-@@ -304,11 +373,15 @@
- 	done; \
- 	for i in $$list; do \
- 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-+	  case "$$ext" in \
-+	    1*) ;; \
-+	    *) ext='1' ;; \
-+	  esac; \
- 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
- 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
- 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
--	  echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
--	  rm -f $(DESTDIR)$(man1dir)/$$inst; \
-+	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
-+	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
- 	done
- tags: TAGS
- TAGS:
-@@ -316,22 +389,20 @@
- ctags: CTAGS
- CTAGS:
- 
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--
--top_distdir = ..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
- 
- distdir: $(DISTFILES)
- 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- 	list='$(DISTFILES)'; for file in $$list; do \
- 	  case $$file in \
- 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- 	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- 	    dir="/$$dir"; \
--	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
- 	  else \
- 	    dir=''; \
- 	  fi; \
-@@ -352,10 +423,10 @@
- check-am: all-am
- check: check-am
- all-am: Makefile $(INFO_DEPS) $(MANS)
--
- installdirs:
--	$(mkinstalldirs) $(DESTDIR)$(infodir) $(DESTDIR)$(man1dir)
--
-+	for dir in "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)"; do \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	done
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -367,7 +438,7 @@
- installcheck: installcheck-am
- install-strip:
- 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
--	  INSTALL_STRIP_FLAG=-s \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- 	  `test -z '$(STRIP)' || \
- 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
-@@ -376,7 +447,7 @@
- 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
- 
- distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+	-rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
- 	@echo "This command is intended for maintainers to use"
-@@ -387,13 +458,17 @@
- clean-am: clean-generic mostlyclean-am
- 
- distclean: distclean-am
--
-+	-rm -f Makefile
- distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
- dvi-am: $(DVIS)
- 
-+html: html-am
-+
-+html-am: $(HTMLS)
-+
- info: info-am
- 
- info-am: $(INFO_DEPS)
-@@ -406,25 +481,32 @@
- 
- install-info-am: $(INFO_DEPS)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(infodir)
--	@list='$(INFO_DEPS)'; \
-+	test -z "$(infodir)" || $(mkdir_p) "$(DESTDIR)$(infodir)"
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	list='$(INFO_DEPS)'; \
- 	for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	  esac; \
- 	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
--	  for ifile in echo $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9]; do \
-+	  file_i=`echo "$$file" | sed 's|\.info$$||;s|$$|.i|'`; \
-+	  for ifile in $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9] \
-+                       $$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \
- 	    if test -f $$ifile; then \
--	      relfile=`expr "$$ifile" : "$$d/\(.*\)"`; \
--	      echo " $(INSTALL_DATA) $$ifile $(DESTDIR)$(infodir)/$$relfile"; \
--	      $(INSTALL_DATA) $$ifile $(DESTDIR)$(infodir)/$$relfile; \
-+	      relfile=`echo "$$ifile" | sed 's|^.*/||'`; \
-+	      echo " $(INSTALL_DATA) '$$ifile' '$(DESTDIR)$(infodir)/$$relfile'"; \
-+	      $(INSTALL_DATA) "$$ifile" "$(DESTDIR)$(infodir)/$$relfile"; \
- 	    else : ; fi; \
- 	  done; \
- 	done
- 	@$(POST_INSTALL)
- 	@if (install-info --version && \
--	     install-info --version | grep -i -v debian) >/dev/null 2>&1; then \
-+	     install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
- 	  list='$(INFO_DEPS)'; \
- 	  for file in $$list; do \
--	    echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";\
--	    install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file || :;\
-+	    relfile=`echo "$$file" | sed 's|^.*/||'`; \
-+	    echo " install-info --info-dir='$(DESTDIR)$(infodir)' '$(DESTDIR)$(infodir)/$$relfile'";\
-+	    install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$relfile" || :;\
- 	  done; \
- 	else : ; fi
- install-man: install-man1
-@@ -432,7 +514,7 @@
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
--
-+	-rm -f Makefile
- maintainer-clean-am: distclean-am maintainer-clean-aminfo \
- 	maintainer-clean-generic maintainer-clean-vti
- 
-@@ -453,21 +535,22 @@
- uninstall-man: uninstall-man1
- 
- .PHONY: all all-am check check-am clean clean-generic dist-info \
--	distclean distclean-generic distdir dvi dvi-am info info-am \
--	install install-am install-data install-data-am install-exec \
--	install-exec-am install-info install-info-am install-man \
--	install-man1 install-strip installcheck installcheck-am \
--	installdirs maintainer-clean maintainer-clean-aminfo \
--	maintainer-clean-generic maintainer-clean-vti mostlyclean \
--	mostlyclean-aminfo mostlyclean-generic mostlyclean-vti pdf \
--	pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \
--	uninstall-man uninstall-man1
--
--
--$(man_MANS): $(top_srcdir)/main.c
--	for i in $(man_MANS) ; do \
--	$(help2man) --name='fast lexical analyzer generator' --section=`echo $$i|rev|cut -f 1 -d .|rev` ../flex > $$i ; \
--	done
-+	distclean distclean-generic distdir dvi dvi-am html html-am \
-+	info info-am install install-am install-data install-data-am \
-+	install-exec install-exec-am install-info install-info-am \
-+	install-man install-man1 install-strip installcheck \
-+	installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-aminfo maintainer-clean-generic \
-+	maintainer-clean-vti mostlyclean mostlyclean-aminfo \
-+	mostlyclean-generic mostlyclean-vti pdf pdf-am ps ps-am \
-+	uninstall uninstall-am uninstall-info-am uninstall-man \
-+	uninstall-man1
-+
-+
-+ at MAINTAINER_MODE_TRUE@$(man_MANS): $(top_srcdir)/main.c
-+ at MAINTAINER_MODE_TRUE@	for i in $(man_MANS) ; do \
-+ at MAINTAINER_MODE_TRUE@	$(help2man) --name='fast lexical analyzer generator' --section=`echo $$i|rev|cut -f 1 -d .|rev` ../flex > $$i ; \
-+ at MAINTAINER_MODE_TRUE@	done
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-diff -Naur flex-2.5.31.orig/doc/flex.texi flex-2.5.31/doc/flex.texi
---- flex-2.5.31.orig/doc/flex.texi	2003-03-27 18:02:59.000000000 +0000
-+++ flex-2.5.31/doc/flex.texi	2005-01-08 07:43:01.593938800 +0000
-@@ -1109,7 +1109,7 @@
- @cindex actions, embedded C strings
- @cindex C-strings, in actions
- @cindex comments, in actions
--If the action contains a @samp{@}}, then the action spans till the
-+If the action contains a @samp{@{}, then the action spans till the
- balancing @samp{@}} is found, and the action may cross multiple lines.
- @code{flex} knows about C strings and comments and won't be fooled by
- braces found within them, but also allows actions to begin with
-@@ -3804,6 +3804,7 @@
- @example
- @verbatim
-         // An example of using the flex C++ scanner class.
-+    %option noyywrap
- 
-     %{
-     int mylineno = 0;
-@@ -3832,7 +3833,7 @@
-                 if(c == '\n')
-                     ++mylineno;
- 
--                else if(c == @samp{*})
-+                else if(c == '*')
-                     {
-                     if((c = yyinput()) == '/')
-                         break;
-@@ -3842,19 +3843,19 @@
-                 }
-             }
- 
--    {number}  cout  "number "  YYText()  '\n';
-+    {number}  std::cout <<  "number " <<  YYText() <<  '\n';
- 
-     \n        mylineno++;
- 
--    {name}    cout  "name "  YYText()  '\n';
-+    {name}    std::cout <<  "name " <<  YYText()  << '\n';
- 
--    {string}  cout  "string "  YYText()  '\n';
-+    {string}  std::cout <<  "string " <<   YYText() <<  '\n';
- 
-     %%
- 
-     int main( int /* argc */, char** /* argv */ )
-         {
--        @code{flex}Lexer* lexer = new yyFlexLexer;
-+        FlexLexer* lexer = new yyFlexLexer;
-         while(lexer->yylex() != 0)
-             ;
-         return 0;
-@@ -3866,7 +3867,7 @@
- If you want to create multiple (different) lexer classes, you use the
- @samp{-P} flag (or the @code{prefix=} option) to rename each
- @code{yyFlexLexer} to some other @samp{xxFlexLexer}.  You then can
--include @file{FlexLexer.h>} in your other sources once per lexer class,
-+include @file{FlexLexer>} in your other sources once per lexer class,
- first renaming @code{yyFlexLexer} as follows:
- 
- @cindex include files, with C++
-@@ -3876,11 +3877,11 @@
- @verbatim
-     #undef yyFlexLexer
-     #define yyFlexLexer xxFlexLexer
--    #include <FflexLexer.h>
-+    #include <FflexLexer>
- 
-     #undef yyFlexLexer
-     #define yyFlexLexer zzFlexLexer
--    #include FlexLexer.h>
-+    #include FlexLexer>
- @end verbatim
- @end example
- 
-diff -Naur flex-2.5.31.orig/doc/mdate-sh flex-2.5.31/doc/mdate-sh
---- flex-2.5.31.orig/doc/mdate-sh	2003-04-01 16:32:35.000000000 +0000
-+++ flex-2.5.31/doc/mdate-sh	2005-01-08 07:43:01.611936064 +0000
-@@ -1,6 +1,6 @@
- #!/bin/sh
- # Get modification time of a file or directory and pretty-print it.
--# Copyright 1995, 1996, 1997 Free Software Foundation, Inc.
-+# Copyright (C) 1995, 1996, 1997, 2003  Free Software Foundation, Inc.
- # written by Ulrich Drepper <drepper at gnu.ai.mit.edu>, June 1995
- #
- # This program is free software; you can redistribute it and/or modify
-@@ -30,24 +30,38 @@
- LC_TIME=C
- export LC_TIME
- 
--# Get the extended ls output of the file or directory.
--# On HPUX /bin/sh, "set" interprets "-rw-r--r--" as options, so the "x" below.
-+save_arg1="$1"
-+
-+# Find out how to get the extended ls output of a file or directory.
- if ls -L /dev/null 1>/dev/null 2>&1; then
--  set - x`ls -L -l -d $1`
-+  ls_command='ls -L -l -d'
- else
--  set - x`ls -l -d $1`
-+  ls_command='ls -l -d'
- fi
--# The month is at least the fourth argument
--# (3 shifts here, the next inside the loop).
--shift
--shift
--shift
- 
--# Find the month.  Next argument is day, followed by the year or time.
-+# A `ls -l' line looks as follows on OS/2.
-+#  drwxrwx---        0 Aug 11  2001 foo
-+# This differs from Unix, which adds ownership information.
-+#  drwxrwx---   2 root  root      4096 Aug 11  2001 foo
-+#
-+# To find the date, we split the line on spaces and iterate on words
-+# until we find a month.  This cannot work with files whose owner is a
-+# user named `Jan', or `Feb', etc.  However, it's unlikely that `/'
-+# will be owned by a user whose name is a month.  So we first look at
-+# the extended ls output of the root directory to decide how many
-+# words should be skipped to get the date.
-+
-+# On HPUX /bin/sh, "set" interprets "-rw-r--r--" as options, so the "x" below.
-+set - x`$ls_command /`
-+
-+# Find which argument is the month.
- month=
-+command=
- until test $month
- do
-   shift
-+  # Add another shift to the command.
-+  command="$command shift;"
-   case $1 in
-     Jan) month=January; nummonth=1;;
-     Feb) month=February; nummonth=2;;
-@@ -64,6 +78,28 @@
-   esac
- done
- 
-+# Get the extended ls output of the file or directory.
-+set - x`eval "$ls_command \"\$save_arg1\""`
-+
-+# Remove all preceding arguments
-+eval $command
-+
-+# Get the month.  Next argument is day, followed by the year or time.
-+case $1 in
-+  Jan) month=January; nummonth=1;;
-+  Feb) month=February; nummonth=2;;
-+  Mar) month=March; nummonth=3;;
-+  Apr) month=April; nummonth=4;;
-+  May) month=May; nummonth=5;;
-+  Jun) month=June; nummonth=6;;
-+  Jul) month=July; nummonth=7;;
-+  Aug) month=August; nummonth=8;;
-+  Sep) month=September; nummonth=9;;
-+  Oct) month=October; nummonth=10;;
-+  Nov) month=November; nummonth=11;;
-+  Dec) month=December; nummonth=12;;
-+esac
-+
- day=$2
- 
- # Here we have to deal with the problem that the ls output gives either
-diff -Naur flex-2.5.31.orig/doc/texinfo.tex flex-2.5.31/doc/texinfo.tex
---- flex-2.5.31.orig/doc/texinfo.tex	2003-03-26 16:19:35.000000000 +0000
-+++ flex-2.5.31/doc/texinfo.tex	2005-01-08 07:43:01.669927248 +0000
-@@ -3,7 +3,7 @@
- % Load plain if necessary, i.e., if running under initex.
- \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
- %
--\def\texinfoversion{2003-03-22.08}
-+\def\texinfoversion{2003-08-11.14}
- %
- % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
- % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-@@ -88,6 +88,7 @@
- \let\ptexgtr=>
- \let\ptexhat=^
- \let\ptexi=\i
-+\let\ptexindent=\indent
- \let\ptexlbrace=\{
- \let\ptexless=<
- \let\ptexplus=+
-@@ -256,9 +257,6 @@
-     \normalturnoffactive  % \ in index entries must not stay \, e.g., if
-                    % the page break happens to be in the middle of an example.
-     \shipout\vbox{%
--      % Do this early so pdf references go to the beginning of the page.
--      \ifpdfmakepagedest \pdfmkdest{\the\pageno} \fi
--      %
-       \ifcropmarks \vbox to \outervsize\bgroup
-         \hsize = \outerhsize
-         \vskip-\topandbottommargin
-@@ -278,6 +276,9 @@
-           \vbox\bgroup
-       \fi
-       %
-+      % Do this early so pdf references go to the beginning of the page.
-+      \ifpdfmakepagedest \pdfmkdest{\the\pageno}\fi
-+      %
-       \unvbox\headlinebox
-       \pagebody{#1}%
-       \ifdim\ht\footlinebox > 0pt
-@@ -847,7 +848,8 @@
- 
- % @paragraphindent NCHARS
- % We'll use ems for NCHARS, close enough.
--% We cannot implement @paragraphindent asis, though.
-+% NCHARS can also be the word `asis' or `none'.
-+% We cannot feasibly implement @paragraphindent asis, though.
- % 
- \def\asisword{asis} % no translation, these are keywords
- \def\noneword{none}
-@@ -883,6 +885,53 @@
-   \fi
- }
- 
-+% @firstparagraphindent WORD
-+% If WORD is `none', then suppress indentation of the first paragraph
-+% after a section heading.  If WORD is `insert', then do indent at such
-+% paragraphs.
-+%
-+% The paragraph indentation is suppressed or not by calling
-+% \suppressfirstparagraphindent, which the sectioning commands do.
-+% We switch the definition of this back and forth according to WORD.
-+% By default, we suppress indentation.
-+%
-+\def\suppressfirstparagraphindent{\dosuppressfirstparagraphindent}
-+\newdimen\currentparindent
-+%
-+\def\insertword{insert}
-+%
-+\def\firstparagraphindent{\parsearg\dofirstparagraphindent}
-+\def\dofirstparagraphindent#1{%
-+  \def\temp{#1}%
-+  \ifx\temp\noneword
-+    \let\suppressfirstparagraphindent = \dosuppressfirstparagraphindent
-+  \else\ifx\temp\insertword
-+    \let\suppressfirstparagraphindent = \relax
-+  \else
-+    \errhelp = \EMsimple
-+    \errmessage{Unknown @firstparagraphindent option `\temp'}%
-+  \fi\fi
-+}
-+
-+% Here is how we actually suppress indentation.  Redefine \everypar to
-+% \kern backwards by \parindent, and then reset itself to empty.
-+%
-+% We also make \indent itself not actually do anything until the next
-+% paragraph.
-+%
-+\gdef\dosuppressfirstparagraphindent{%
-+  \gdef\indent{%
-+    \global\let\indent=\ptexindent
-+    \global\everypar = {}%
-+  }%
-+  \global\everypar = {%
-+    \kern-\parindent
-+    \global\let\indent=\ptexindent
-+    \global\everypar = {}%
-+  }%
-+}%
-+
-+
- % @asis just yields its argument.  Used with @table, for example.
- %
- \def\asis#1{#1}
-@@ -1055,32 +1104,34 @@
-       \edef\mylbrace{\iftrue \string{\else}\fi}\let\{=\mylbrace
-       \edef\myrbrace{\iffalse{\else\string}\fi}\let\}=\myrbrace
-       %
-+      % Read toc first time in order to get the counts of subentries for
-+      % \pdfoutline.
-       \def\chapentry ##1##2##3{}
-       \def\secentry ##1##2##3##4{\advancenumber{chap##2}}
-       \def\subsecentry ##1##2##3##4##5{\advancenumber{sec##2.##3}}
-       \def\subsubsecentry ##1##2##3##4##5##6{\advancenumber{subsec##2.##3.##4}}
--      \let\appendixentry = \chapentry
--      \let\unnumbchapentry = \chapentry
--      \let\unnumbsecentry = \secentry
--      \let\unnumbsubsecentry = \subsecentry
--      \let\unnumbsubsubsecentry = \subsubsecentry
-+      % use \def rather than \let here because we redefine \chapentry et
-+      % al. a second time, below.
-+      \def\appendixentry{\chapentry}
-+      \def\unnumbchapentry{\chapentry}
-+      \def\unnumbsecentry{\secentry}
-+      \def\unnumbsubsecentry{\subsecentry}
-+      \def\unnumbsubsubsecentry{\subsubsecentry}
-       \input \jobname.toc
-+      %
-+      % Read toc second time, this time actually producing the outlines.
-+      % The `-' means take the \expnumber as the absolute number of
-+      % subentries, which we calculated on our first read of the .toc above.
-       \def\chapentry ##1##2##3{%
-         \pdfoutline goto name{\pdfmkpgn{##3}}count-\expnumber{chap##2}{##1}}
-       \def\secentry ##1##2##3##4{%
--        \pdfoutline goto name{\pdfmkpgn{##4}}count-\expnumber{sec##2.##3}{##1}}
-+        \pdfoutline goto name{\pdfmkpgn{##1}}count-\expnumber{sec##2.##3}{##1}}
-       \def\subsecentry ##1##2##3##4##5{%
-         \pdfoutline goto name{\pdfmkpgn{##5}}count-\expnumber{subsec##2.##3.##4}{##1}}
-       \def\subsubsecentry ##1##2##3##4##5##6{%
-         \pdfoutline goto name{\pdfmkpgn{##6}}{##1}}
--      \let\appendixentry = \chapentry
--      \let\unnumbchapentry = \chapentry
--      \let\unnumbsecentry = \secentry
--      \let\unnumbsubsecentry = \subsecentry
--      \let\unnumbsubsubsecentry = \subsubsecentry
-       %
-       % Make special characters normal for writing to the pdf file.
--      % 
-       \indexnofonts
-       \let\tt=\relax
-       \turnoffactive
-@@ -1435,7 +1486,8 @@
- 
- % \smartitalic{ARG} outputs arg in italics, followed by an italic correction
- % unless the following character is such as not to need one.
--\def\smartitalicx{\ifx\next,\else\ifx\next-\else\ifx\next.\else\/\fi\fi\fi}
-+\def\smartitalicx{\ifx\next,\else\ifx\next-\else\ifx\next.\else
-+                    \ptexslash\fi\fi\fi}
- \def\smartslanted#1{{\ifusingtt\ttsl\sl #1}\futurelet\next\smartitalicx}
- \def\smartitalic#1{{\ifusingtt\ttsl\it #1}\futurelet\next\smartitalicx}
- 
-@@ -1567,7 +1619,7 @@
-     \gdef\kbdexamplefont{\tt}\gdef\kbdfont{\tt}%
-   \else
-     \errhelp = \EMsimple
--    \errmessage{Unknown @kbdinputstyle `\arg'}%
-+    \errmessage{Unknown @kbdinputstyle option `\arg'}%
-   \fi\fi\fi
- }
- \def\worddistinct{distinct}
-@@ -2086,17 +2138,20 @@
- }
- 
- \def\itemizey #1#2{%
--\aboveenvbreak %
--\itemmax=\itemindent %
--\advance \itemmax by -\itemmargin %
--\advance \leftskip by \itemindent %
-+  \aboveenvbreak
-+  \itemmax=\itemindent
-+  \advance\itemmax by -\itemmargin
-+  \advance\leftskip by \itemindent
- \exdentamount=\itemindent
--\parindent = 0pt %
--\parskip = \smallskipamount %
--\ifdim \parskip=0pt \parskip=2pt \fi%
-+  \parindent=0pt
-+  \parskip=\smallskipamount
-+  \ifdim\parskip=0pt \parskip=2pt \fi
- \def#2{\endgraf\afterenvbreak\endgroup}%
- \def\itemcontents{#1}%
--\let\item=\itemizeitem}
-+  % @itemize with no arg is equivalent to @itemize @bullet.
-+  \ifx\itemcontents\empty\def\itemcontents{\bullet}\fi
-+  \let\item=\itemizeitem
-+}
- 
- % \splitoff TOKENS\endmark defines \first to be the first token in
- % TOKENS, and \rest to be the remainder.
-@@ -2471,20 +2526,6 @@
- % Prevent errors for section commands.
- % Used in @ignore and in failing conditionals.
- \def\ignoresections{%
--  \let\chapter=\relax
--  \let\unnumbered=\relax
--  \let\top=\relax
--  \let\unnumberedsec=\relax
--  \let\unnumberedsection=\relax
--  \let\unnumberedsubsec=\relax
--  \let\unnumberedsubsection=\relax
--  \let\unnumberedsubsubsec=\relax
--  \let\unnumberedsubsubsection=\relax
--  \let\section=\relax
--  \let\subsec=\relax
--  \let\subsubsec=\relax
--  \let\subsection=\relax
--  \let\subsubsection=\relax
-   \let\appendix=\relax
-   \let\appendixsec=\relax
-   \let\appendixsection=\relax
-@@ -2492,110 +2533,26 @@
-   \let\appendixsubsection=\relax
-   \let\appendixsubsubsec=\relax
-   \let\appendixsubsubsection=\relax
-+  %\let\begin=\relax
-+  %\let\bye=\relax
-+  \let\centerchap=\relax
-+  \let\chapter=\relax
-   \let\contents=\relax
-+  \let\section=\relax
-   \let\smallbook=\relax
-+  \let\subsec=\relax
-+  \let\subsection=\relax
-+  \let\subsubsec=\relax
-+  \let\subsubsection=\relax
-   \let\titlepage=\relax
--}
--
--% Used in nested conditionals, where we have to parse the Texinfo source
--% and so want to turn off most commands, in case they are used
--% incorrectly.
--%
--% We use \empty instead of \relax for the @def... commands, so that \end
--% doesn't throw an error.  For instance:
--% @ignore
--% @deffn ...
--% @end deffn
--% @end ignore
--% 
--% The @end deffn is going to get expanded, because we're trying to allow
--% nested conditionals.  But we don't want to expand the actual @deffn,
--% since it might be syntactically correct and intended to be ignored.
--% Since \end checks for \relax, using \empty does not cause an error.
--% 
--\def\ignoremorecommands{%
--  \let\defcodeindex = \relax
--  \let\defcv = \empty
--  \let\defcvx = \empty
--  \let\Edefcv = \empty
--  \let\deffn = \empty
--  \let\deffnx = \empty
--  \let\Edeffn = \empty
--  \let\defindex = \relax
--  \let\defivar = \empty
--  \let\defivarx = \empty
--  \let\Edefivar = \empty
--  \let\defmac = \empty
--  \let\defmacx = \empty
--  \let\Edefmac = \empty
--  \let\defmethod = \empty
--  \let\defmethodx = \empty
--  \let\Edefmethod = \empty
--  \let\defop = \empty
--  \let\defopx = \empty
--  \let\Edefop = \empty
--  \let\defopt = \empty
--  \let\defoptx = \empty
--  \let\Edefopt = \empty
--  \let\defspec = \empty
--  \let\defspecx = \empty
--  \let\Edefspec = \empty
--  \let\deftp = \empty
--  \let\deftpx = \empty
--  \let\Edeftp = \empty
--  \let\deftypefn = \empty
--  \let\deftypefnx = \empty
--  \let\Edeftypefn = \empty
--  \let\deftypefun = \empty
--  \let\deftypefunx = \empty
--  \let\Edeftypefun = \empty
--  \let\deftypeivar = \empty
--  \let\deftypeivarx = \empty
--  \let\Edeftypeivar = \empty
--  \let\deftypemethod = \empty
--  \let\deftypemethodx = \empty
--  \let\Edeftypemethod = \empty
--  \let\deftypeop = \empty
--  \let\deftypeopx = \empty
--  \let\Edeftypeop = \empty
--  \let\deftypevar = \empty
--  \let\deftypevarx = \empty
--  \let\Edeftypevar = \empty
--  \let\deftypevr = \empty
--  \let\deftypevrx = \empty
--  \let\Edeftypevr = \empty
--  \let\defun = \empty
--  \let\defunx = \empty
--  \let\Edefun = \empty
--  \let\defvar = \empty
--  \let\defvarx = \empty
--  \let\Edefvar = \empty
--  \let\defvr = \empty
--  \let\defvrx = \empty
--  \let\Edefvr = \empty
--  \let\clear = \relax
--  \let\down = \relax
--  \let\evenfooting = \relax
--  \let\evenheading = \relax
--  \let\everyfooting = \relax
--  \let\everyheading = \relax
--  \let\headings = \relax
--  \let\include = \relax
--  \let\item = \relax
--  \let\lowersections = \relax
--  \let\oddfooting = \relax
--  \let\oddheading = \relax
--  \let\printindex = \relax
--  \let\pxref = \relax
--  \let\raisesections = \relax
--  \let\ref = \relax
--  \let\set = \relax
--  \let\setchapternewpage = \relax
--  \let\setchapterstyle = \relax
--  \let\settitle = \relax
--  \let\up = \relax
--  \let\verbatiminclude = \relax
--  \let\xref = \relax
-+  \let\top=\relax
-+  \let\unnumbered=\relax
-+  \let\unnumberedsec=\relax
-+  \let\unnumberedsection=\relax
-+  \let\unnumberedsubsec=\relax
-+  \let\unnumberedsubsection=\relax
-+  \let\unnumberedsubsubsec=\relax
-+  \let\unnumberedsubsubsection=\relax
- }
- 
- % Ignore @ignore, @ifhtml, @ifinfo, and the like.
-@@ -2617,141 +2574,78 @@
- % which this file should belong to.  Ignore this in TeX.
- \let\dircategory = \comment
- 
--% Ignore text until a line `@end #1'.
-+% Ignore text until a line `@end #1', keeping track of nested conditionals.
- %
-+% A count to remember the depth of nesting.
-+\newcount\doignorecount
-+
- \def\doignore#1{\begingroup
-   % Don't complain about control sequences we have declared \outer.
-   \ignoresections
-   %
--  % Define a command to swallow text until we reach `@end #1'.
--  % This @ is a catcode 12 token (that is the normal catcode of @ in
--  % this texinfo.tex file).  We change the catcode of @ below to match.
--  \long\def\doignoretext##1 at end #1{\enddoignore}%
--  %
-   % Make sure that spaces turn into tokens that match what \doignoretext wants.
-   \catcode\spaceChar = 10
-   %
--  % Ignore braces, too, so mismatched braces don't cause trouble.
-+  % Ignore braces, so mismatched braces don't cause trouble.
-   \catcode`\{ = 9
-   \catcode`\} = 9
-   %
--  % We must not have @c interpreted as a control sequence.
--  \catcode`\@ = 12
-+  % Count number of #1's that we've seen.
-+  \doignorecount = 0
-   %
--  \def\ignoreword{#1}%
--  \ifx\ignoreword\documentdescriptionword
--    % The c kludge breaks documentdescription, since
--    % `documentdescription' contains a `c'.  Means not everything will
--    % be ignored inside @documentdescription, but oh well...
--  \else
--    % Make the letter c a comment character so that the rest of the line
--    % will be ignored. This way, the document can have (for example)
--    %   @c @end ifinfo
--    % and the @end ifinfo will be properly ignored.
--    % (We've just changed @ to catcode 12.)
--    \catcode`\c = 14
--  \fi
--  %
--  % And now expand the command defined above.
--  \doignoretext
--}
--
--% What we do to finish off ignored text.
--%
--\def\enddoignore{\endgroup\ignorespaces}%
--
--\newif\ifwarnedobs\warnedobsfalse
--\def\obstexwarn{%
--  \ifwarnedobs\relax\else
--  % We need to warn folks that they may have trouble with TeX 3.0.
--  % This uses \immediate\write16 rather than \message to get newlines.
--    \immediate\write16{}
--    \immediate\write16{WARNING: for users of Unix TeX 3.0!}
--    \immediate\write16{This manual trips a bug in TeX version 3.0 (tex hangs).}
--    \immediate\write16{If you are running another version of TeX, relax.}
--    \immediate\write16{If you are running Unix TeX 3.0, kill this TeX process.}
--    \immediate\write16{  Then upgrade your TeX installation if you can.}
--    \immediate\write16{  (See ftp://ftp.gnu.org/non-gnu/TeX.README.)}
--    \immediate\write16{If you are stuck with version 3.0, run the}
--    \immediate\write16{  script ``tex3patch'' from the Texinfo distribution}
--    \immediate\write16{  to use a workaround.}
--    \immediate\write16{}
--    \global\warnedobstrue
--    \fi
-+  % Swallow text until we reach the matching `@end #1'.
-+  \expandafter \dodoignore \csname#1\endcsname {#1}%
- }
- 
--% **In TeX 3.0, setting text in \nullfont hangs tex.  For a
--% workaround (which requires the file ``dummy.tfm'' to be installed),
--% uncomment the following line:
--%%%%%\font\nullfont=dummy\let\obstexwarn=\relax
--
--% Ignore text, except that we keep track of conditional commands for
--% purposes of nesting, up to an `@end #1' command.
--%
--\def\nestedignore#1{%
--  \obstexwarn
--  % We must actually expand the ignored text to look for the @end
--  % command, so that nested ignore constructs work.  Thus, we put the
--  % text into a \vbox and then do nothing with the result.  To minimize
--  % the chance of memory overflow, we follow the approach outlined on
--  % page 401 of the TeXbook.
--  %
--  \setbox0 = \vbox\bgroup
--    % Don't complain about control sequences we have declared \outer.
--    \ignoresections
--    %
--    % Define `@end #1' to end the box, which will in turn undefine the
--    % @end command again.
--    \expandafter\def\csname E#1\endcsname{\egroup\ignorespaces}%
--    %
--    % We are going to be parsing Texinfo commands.  Most cause no
--    % trouble when they are used incorrectly, but some commands do
--    % complicated argument parsing or otherwise get confused, so we
--    % undefine them.
--    %
--    % We can't do anything about stray @-signs, unfortunately;
--    % they'll produce `undefined control sequence' errors.
--    \ignoremorecommands
--    %
--    % Set the current font to be \nullfont, a TeX primitive, and define
--    % all the font commands to also use \nullfont.  We don't use
--    % dummy.tfm, as suggested in the TeXbook, because some sites
--    % might not have that installed.  Therefore, math mode will still
--    % produce output, but that should be an extremely small amount of
--    % stuff compared to the main input.
--    %
--    \nullfont
--    \let\tenrm=\nullfont \let\tenit=\nullfont \let\tensl=\nullfont
--    \let\tenbf=\nullfont \let\tentt=\nullfont \let\smallcaps=\nullfont
--    \let\tensf=\nullfont
--    % Similarly for index fonts.
--    \let\smallrm=\nullfont \let\smallit=\nullfont \let\smallsl=\nullfont
--    \let\smallbf=\nullfont \let\smalltt=\nullfont \let\smallsc=\nullfont
--    \let\smallsf=\nullfont
--    % Similarly for smallexample fonts.
--    \let\smallerrm=\nullfont \let\smallerit=\nullfont \let\smallersl=\nullfont
--    \let\smallerbf=\nullfont \let\smallertt=\nullfont \let\smallersc=\nullfont
--    \let\smallersf=\nullfont
--    %
--    % Don't complain when characters are missing from the fonts.
--    \tracinglostchars = 0
--    %
--    % Don't bother to do space factor calculations.
--    \frenchspacing
--    %
--    % Don't report underfull hboxes.
--    \hbadness = 10000
--    %
--    % Do minimal line-breaking.
--    \pretolerance = 10000
-+{ \catcode`@=11 % We want to use \ST at P which cannot appear in texinfo source.
-+  \obeylines %
-     %
--    % Do not execute instructions in @tex.
--    \def\tex{\doignore{tex}}%
--    % Do not execute macro definitions.
--    % `c' is a comment character, so the word `macro' will get cut off.
--    \def\macro{\doignore{ma}}%
-+  \gdef\dodoignore#1#2{%
-+    % #1 contains, e.g., \ifinfo, a.k.a. @ifinfo.
-+    % #2 contains the string `ifinfo'.
-+    %
-+    % Define a command to find the next `@end #2', which must be on a line
-+    % by itself.
-+    \long\def\doignoretext##1^^M\end #2{\doignoretextyyy##1^^M#1\ST at P}%
-+    % And this command to find another #1 command, at the beginning of a
-+    % line.  (Otherwise, we would consider a line `@c @ifset', for
-+    % example, to count as an @ifset for nesting.)
-+    \long\def\doignoretextyyy##1^^M#1##2\ST at P{\doignoreyyy{##2}\ST at P}%
-+    %
-+    % And now expand that command.
-+    \obeylines %
-+    \doignoretext ^^M%
-+  }%
- }
- 
-+\def\doignoreyyy#1{%
-+  \def\temp{#1}%
-+  \ifx\temp\empty			% Nothing found.
-+    \let\next\doignoretextzzz
-+  \else					% Found a nested condition, ...
-+    \advance\doignorecount by 1
-+    \let\next\doignoretextyyy		% ..., look for another.
-+    % If we're here, #1 ends with ^^M\ifinfo (for example).
-+  \fi
-+  \next #1% the token \ST at P is present just after this macro.
-+}
-+
-+% We have to swallow the remaining "\ST at P".
-+% 
-+\def\doignoretextzzz#1{%
-+  \ifnum\doignorecount = 0	% We have just found the outermost @end.
-+    \let\next\enddoignore
-+  \else				% Still inside a nested condition.
-+    \advance\doignorecount by -1
-+    \let\next\doignoretext      % Look for the next @end.
-+  \fi
-+  \next
-+}
-+
-+% Finish off ignored text.
-+\def\enddoignore{\endgroup\ignorespaces}
-+
-+
- % @set VAR sets the variable VAR to an empty value.
- % @set VAR REST-OF-LINE sets VAR to the value REST-OF-LINE.
- %
-@@ -2828,7 +2722,7 @@
-   \next
- }
- \def\ifsetsucceed{\conditionalsucceed{ifset}}
--\def\ifsetfail{\nestedignore{ifset}}
-+\def\ifsetfail{\doignore{ifset}}
- \defineunmatchedend{ifset}
- 
- % @ifclear VAR ... @end ifclear reads the `...' iff VAR has never been
-@@ -2844,7 +2738,7 @@
-   \next
- }
- \def\ifclearsucceed{\conditionalsucceed{ifclear}}
--\def\ifclearfail{\nestedignore{ifclear}}
-+\def\ifclearfail{\doignore{ifclear}}
- \defineunmatchedend{ifclear}
- 
- % @iftex, @ifnothtml, @ifnotinfo, @ifnotplaintext always succeed; we
-@@ -3340,6 +3234,7 @@
-   %
-   \smallfonts \rm
-   \tolerance = 9500
-+  \everypar = {}% don't want the \kern\-parindent from indentation suppression.
-   \indexbreaks
-   %
-   % See if the index file exists and is nonempty.
-@@ -3721,6 +3616,7 @@
-     \numberedsubsubseczzz{#2}
-   \fi
- \fi
-+\suppressfirstparagraphindent
- }
- 
- % like \numhead, but chooses appendix heading levels
-@@ -3740,6 +3636,7 @@
-     \appendixsubsubseczzz{#2}
-   \fi
- \fi
-+\suppressfirstparagraphindent
- }
- 
- % like \numhead, but chooses numberless heading levels
-@@ -3759,6 +3656,7 @@
-     \unnumberedsubsubseczzz{#2}
-   \fi
- \fi
-+\suppressfirstparagraphindent
- }
- 
- % @chapter, @appendix, @unnumbered.
-@@ -3966,23 +3864,27 @@
- %          if justification is not attempted.  Hence \raggedright.
- 
- 
--\def\majorheading{\parsearg\majorheadingzzz}
--\def\majorheadingzzz #1{%
-+\def\majorheading{%
-   {\advance\chapheadingskip by 10pt \chapbreak }%
--  {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
--                    \parindent=0pt\raggedright
--                    \rm #1\hfill}}\bigskip \par\penalty 200}
-+  \parsearg\chapheadingzzz
-+}
- 
--\def\chapheading{\parsearg\chapheadingzzz}
--\def\chapheadingzzz #1{\chapbreak %
-+\def\chapheading{\chapbreak \parsearg\chapheadingzzz}
-+\def\chapheadingzzz #1{%
-   {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
-                     \parindent=0pt\raggedright
--                    \rm #1\hfill}}\bigskip \par\penalty 200}
-+                    \rm #1\hfill}}%
-+  \bigskip \par\penalty 200\relax
-+  \suppressfirstparagraphindent
-+}
- 
- % @heading, @subheading, @subsubheading.
--\def\heading{\parsearg\plainsecheading}
--\def\subheading{\parsearg\plainsubsecheading}
--\def\subsubheading{\parsearg\plainsubsubsecheading}
-+\def\heading{\parsearg\doheading}
-+\def\subheading{\parsearg\dosubheading}
-+\def\subsubheading{\parsearg\dosubsubheading}
-+\def\doheading#1{\plainsecheading{#1}\suppressfirstparagraphindent}
-+\def\dosubheading#1{\plainsubsecheading{#1}\suppressfirstparagraphindent}
-+\def\dosubsubheading#1{\plainsubsubsecheading{#1}\suppressfirstparagraphindent}
- 
- % These macros generate a chapter, section, etc. heading only
- % (including whitespace, linebreaking, etc. around it),
-@@ -4015,7 +3917,7 @@
- \global\let\pagealignmacro=\chappager
- \global\def\HEADINGSon{\HEADINGSsingle}}
- 
--\def\CHAPPAGodd{
-+\def\CHAPPAGodd{%
- \global\let\contentsalignmacro = \chapoddpage
- \global\let\pchapsepmacro=\chapoddpage
- \global\let\pagealignmacro=\chapoddpage
-@@ -4023,7 +3925,7 @@
- 
- \CHAPPAGon
- 
--\def\CHAPFplain{
-+\def\CHAPFplain{%
- \global\let\chapmacro=\chfplain
- \global\let\unnumbchapmacro=\unnchfplain
- \global\let\centerchapmacro=\centerchfplain}
-@@ -4077,7 +3979,7 @@
-                        \hfill {\rm #1}\hfill}}\bigskip \par\nobreak
- }
- 
--\def\CHAPFopen{
-+\def\CHAPFopen{%
- \global\let\chapmacro=\chfopen
- \global\let\unnumbchapmacro=\unnchfopen
- \global\let\centerchapmacro=\centerchfopen}
-@@ -4430,6 +4332,7 @@
-   \let\equiv=\ptexequiv
-   \let\!=\ptexexclam
-   \let\i=\ptexi
-+  \let\indent=\ptexindent
-   \let\{=\ptexlbrace
-   \let\+=\tabalign
-   \let\}=\ptexrbrace
-@@ -5908,7 +5811,7 @@
-          goto file{\the\filename.pdf} name{#1}%
-      \else
-        \startlink attr{/Border [0 0 0]}%
--         goto name{#1}%
-+         goto name{\pdfmkpgn{#1}}%
-      \fi
-     }%
-     \linkcolor
-@@ -6119,7 +6022,6 @@
-     \closein 1
-     \input \jobname.aux
-     \global\havexrefstrue
--    \global\warnedobstrue
-   \fi
-   % Open the new aux file.  TeX will close it automatically at exit.
-   \openout\auxfile=\jobname.aux
-@@ -6146,13 +6048,14 @@
- %
- % Auto-number footnotes.  Otherwise like plain.
- \gdef\footnote{%
-+  \let\indent=\ptexindent
-   \global\advance\footnoteno by \@ne
-   \edef\thisfootno{$^{\the\footnoteno}$}%
-   %
-   % In case the footnote comes at the end of a sentence, preserve the
-   % extra spacing after we do the footnote number.
-   \let\@sf\empty
--  \ifhmode\edef\@sf{\spacefactor\the\spacefactor}\/\fi
-+  \ifhmode\edef\@sf{\spacefactor\the\spacefactor}\ptexslash\fi
-   %
-   % Remove inadvertent blank space before typesetting the footnote number.
-   \unskip
-diff -Naur flex-2.5.31.orig/examples/Makefile.in flex-2.5.31/examples/Makefile.in
---- flex-2.5.31.orig/examples/Makefile.in	2003-04-01 16:32:35.000000000 +0000
-+++ flex-2.5.31/examples/Makefile.in	2005-01-08 07:43:01.689924208 +0000
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.7 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # @configure_input@
- 
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -34,7 +34,6 @@
- # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- # PURPOSE.
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -42,7 +41,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -57,6 +55,30 @@
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
- host_triplet = @host@
-+subdir = examples
-+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
-+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+	html-recursive info-recursive install-data-recursive \
-+	install-exec-recursive install-info-recursive \
-+	install-recursive installcheck-recursive installdirs-recursive \
-+	pdf-recursive ps-recursive uninstall-info-recursive \
-+	uninstall-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -96,12 +118,16 @@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
- LIBICONV = @LIBICONV@
- LIBINTL = @LIBINTL@
-+LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LN_S = @LN_S@
- LTLIBICONV = @LTLIBICONV@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- M4 = @M4@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
-@@ -132,6 +158,7 @@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
- am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
- bindir = @bindir@
- build = @build@
-@@ -153,6 +180,7 @@
- libexecdir = @libexecdir@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-@@ -160,38 +188,47 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--
- EXTRA_DIST = \
- 	testxxLexer.l \
- 	debflex.awk \
- 	README
- 
--
- SUBDIRS = \
- 	manual \
- 	fastwc
- 
--subdir = examples
--mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--	ps-recursive install-info-recursive uninstall-info-recursive \
--	all-recursive install-data-recursive install-exec-recursive \
--	installdirs-recursive install-recursive uninstall-recursive \
--	check-recursive installcheck-recursive
--DIST_COMMON = README Makefile.am Makefile.in
--DIST_SUBDIRS = $(SUBDIRS)
- all: all-recursive
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  examples/Makefile'; \
- 	cd $(top_srcdir) && \
- 	  $(AUTOMAKE) --gnu  examples/Makefile
--Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- uninstall-info-am:
- 
- # This directory's subdirectories are mostly independent; you can cd
-@@ -253,14 +290,6 @@
- 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- 	done
- 
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
-@@ -269,14 +298,23 @@
- 	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
- 	mkid -fID $$unique
-+tags: TAGS
- 
- TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
- 		$(TAGS_FILES) $(LISP)
- 	tags=; \
- 	here=`pwd`; \
-+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-+	  include_option=--etags-include; \
-+	  empty_fix=.; \
-+	else \
-+	  include_option=--include; \
-+	  empty_fix=; \
-+	fi; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
--	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-+	    test ! -f $$subdir/TAGS || \
-+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- 	  fi; \
- 	done; \
- 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-@@ -285,10 +323,11 @@
- 	  done | \
- 	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$tags$$unique" \
--	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
--	     $$tags $$unique
--
-+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	    $$tags $$unique; \
-+	fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
- 		$(TAGS_FILES) $(LISP)
-@@ -311,22 +350,20 @@
- 
- distclean-tags:
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--
--top_distdir = ..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
- 
- distdir: $(DISTFILES)
- 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- 	list='$(DISTFILES)'; for file in $$list; do \
- 	  case $$file in \
- 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- 	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- 	    dir="/$$dir"; \
--	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
- 	  else \
- 	    dir=''; \
- 	  fi; \
-@@ -343,13 +380,13 @@
- 	done
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
--	    test -d $(distdir)/$$subdir \
--	    || mkdir $(distdir)/$$subdir \
-+	    test -d "$(distdir)/$$subdir" \
-+	    || mkdir "$(distdir)/$$subdir" \
- 	    || exit 1; \
- 	    (cd $$subdir && \
- 	      $(MAKE) $(AM_MAKEFLAGS) \
--	        top_distdir="$(top_distdir)" \
--	        distdir=../$(distdir)/$$subdir \
-+	        top_distdir="../$(top_distdir)" \
-+	        distdir="../$(distdir)/$$subdir" \
- 	        distdir) \
- 	      || exit 1; \
- 	  fi; \
-@@ -359,7 +396,6 @@
- all-am: Makefile
- installdirs: installdirs-recursive
- installdirs-am:
--
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -371,7 +407,7 @@
- installcheck: installcheck-recursive
- install-strip:
- 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
--	  INSTALL_STRIP_FLAG=-s \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- 	  `test -z '$(STRIP)' || \
- 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
-@@ -379,7 +415,7 @@
- clean-generic:
- 
- distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+	-rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
- 	@echo "This command is intended for maintainers to use"
-@@ -389,13 +425,15 @@
- clean-am: clean-generic mostlyclean-am
- 
- distclean: distclean-recursive
--
-+	-rm -f Makefile
- distclean-am: clean-am distclean-generic distclean-tags
- 
- dvi: dvi-recursive
- 
- dvi-am:
- 
-+html: html-recursive
-+
- info: info-recursive
- 
- info-am:
-@@ -411,7 +449,7 @@
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-recursive
--
-+	-rm -f Makefile
- maintainer-clean-am: distclean-am maintainer-clean-generic
- 
- mostlyclean: mostlyclean-recursive
-@@ -430,20 +468,17 @@
- 
- uninstall-info: uninstall-info-recursive
- 
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
--	clean-generic clean-recursive ctags ctags-recursive distclean \
--	distclean-generic distclean-recursive distclean-tags distdir \
--	dvi dvi-am dvi-recursive info info-am info-recursive install \
--	install-am install-data install-data-am install-data-recursive \
--	install-exec install-exec-am install-exec-recursive \
--	install-info install-info-am install-info-recursive install-man \
--	install-recursive install-strip installcheck installcheck-am \
--	installdirs installdirs-am installdirs-recursive \
--	maintainer-clean maintainer-clean-generic \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+	clean clean-generic clean-recursive ctags ctags-recursive \
-+	distclean distclean-generic distclean-recursive distclean-tags \
-+	distdir dvi dvi-am html html-am info info-am install \
-+	install-am install-data install-data-am install-exec \
-+	install-exec-am install-info install-info-am install-man \
-+	install-strip installcheck installcheck-am installdirs \
-+	installdirs-am maintainer-clean maintainer-clean-generic \
- 	maintainer-clean-recursive mostlyclean mostlyclean-generic \
--	mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \
--	ps-recursive tags tags-recursive uninstall uninstall-am \
--	uninstall-info-am uninstall-info-recursive uninstall-recursive
-+	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+	uninstall uninstall-am uninstall-info-am
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -Naur flex-2.5.31.orig/examples/fastwc/Makefile.in flex-2.5.31/examples/fastwc/Makefile.in
---- flex-2.5.31.orig/examples/fastwc/Makefile.in	2003-04-01 16:32:36.000000000 +0000
-+++ flex-2.5.31/examples/fastwc/Makefile.in	2005-01-08 07:43:01.708921320 +0000
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.7 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # @configure_input@
- 
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -34,7 +34,6 @@
- # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- # PURPOSE.
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -42,7 +41,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -57,6 +55,21 @@
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
- host_triplet = @host@
-+subdir = examples/fastwc
-+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
-+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -96,12 +109,16 @@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
- LIBICONV = @LIBICONV@
- LIBINTL = @LIBINTL@
-+LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LN_S = @LN_S@
- LTLIBICONV = @LTLIBICONV@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- M4 = @M4@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
-@@ -132,6 +149,7 @@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
- am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
- bindir = @bindir@
- build = @build@
-@@ -153,6 +171,7 @@
- libexecdir = @libexecdir@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-@@ -160,7 +179,6 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--
- EXTRA_DIST = \
- 	wc5.l \
- 	wc4.l \
-@@ -170,20 +188,38 @@
- 	mywc.c \
- 	README
- 
--subdir = examples/fastwc
--mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--DIST_COMMON = README Makefile.am Makefile.in
- all: all-am
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  examples/fastwc/Makefile'; \
- 	cd $(top_srcdir) && \
- 	  $(AUTOMAKE) --gnu  examples/fastwc/Makefile
--Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- uninstall-info-am:
- tags: TAGS
- TAGS:
-@@ -191,22 +227,20 @@
- ctags: CTAGS
- CTAGS:
- 
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
- 
- distdir: $(DISTFILES)
- 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- 	list='$(DISTFILES)'; for file in $$list; do \
- 	  case $$file in \
- 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- 	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- 	    dir="/$$dir"; \
--	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
- 	  else \
- 	    dir=''; \
- 	  fi; \
-@@ -224,9 +258,7 @@
- check-am: all-am
- check: check-am
- all-am: Makefile
--
- installdirs:
--
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -238,7 +270,7 @@
- installcheck: installcheck-am
- install-strip:
- 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
--	  INSTALL_STRIP_FLAG=-s \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- 	  `test -z '$(STRIP)' || \
- 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
-@@ -246,7 +278,7 @@
- clean-generic:
- 
- distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+	-rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
- 	@echo "This command is intended for maintainers to use"
-@@ -256,13 +288,15 @@
- clean-am: clean-generic mostlyclean-am
- 
- distclean: distclean-am
--
-+	-rm -f Makefile
- distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
- dvi-am:
- 
-+html: html-am
-+
- info: info-am
- 
- info-am:
-@@ -278,7 +312,7 @@
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
--
-+	-rm -f Makefile
- maintainer-clean-am: distclean-am maintainer-clean-generic
- 
- mostlyclean: mostlyclean-am
-@@ -296,8 +330,8 @@
- uninstall-am: uninstall-info-am
- 
- .PHONY: all all-am check check-am clean clean-generic distclean \
--	distclean-generic distdir dvi dvi-am info info-am install \
--	install-am install-data install-data-am install-exec \
-+	distclean-generic distdir dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am install-exec \
- 	install-exec-am install-info install-info-am install-man \
- 	install-strip installcheck installcheck-am installdirs \
- 	maintainer-clean maintainer-clean-generic mostlyclean \
-diff -Naur flex-2.5.31.orig/examples/manual/Makefile.in flex-2.5.31/examples/manual/Makefile.in
---- flex-2.5.31.orig/examples/manual/Makefile.in	2003-04-01 16:32:36.000000000 +0000
-+++ flex-2.5.31/examples/manual/Makefile.in	2005-01-08 07:43:01.774911288 +0000
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.7 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # @configure_input@
- 
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -34,7 +34,6 @@
- # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- # PURPOSE.
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -42,7 +41,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -57,6 +55,22 @@
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
- host_triplet = @host@
-+subdir = examples/manual
-+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-+	ChangeLog
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
-+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -96,12 +110,16 @@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
- LIBICONV = @LIBICONV@
- LIBINTL = @LIBINTL@
-+LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LN_S = @LN_S@
- LTLIBICONV = @LTLIBICONV@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- M4 = @M4@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
-@@ -132,6 +150,7 @@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
- am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
- bindir = @bindir@
- build = @build@
-@@ -153,6 +172,7 @@
- libexecdir = @libexecdir@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-@@ -160,7 +180,6 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--
- EXTRA_DIST = \
- 	ChangeLog \
- 	Makefile.examples \
-@@ -196,20 +215,38 @@
- 	yymore2.lex \
- 	yymoretest.dat
- 
--subdir = examples/manual
--mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--DIST_COMMON = README ChangeLog Makefile.am Makefile.in
- all: all-am
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  examples/manual/Makefile'; \
- 	cd $(top_srcdir) && \
- 	  $(AUTOMAKE) --gnu  examples/manual/Makefile
--Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- uninstall-info-am:
- tags: TAGS
- TAGS:
-@@ -217,22 +254,20 @@
- ctags: CTAGS
- CTAGS:
- 
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
- 
- distdir: $(DISTFILES)
- 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- 	list='$(DISTFILES)'; for file in $$list; do \
- 	  case $$file in \
- 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- 	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- 	    dir="/$$dir"; \
--	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
- 	  else \
- 	    dir=''; \
- 	  fi; \
-@@ -250,9 +285,7 @@
- check-am: all-am
- check: check-am
- all-am: Makefile
--
- installdirs:
--
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -264,7 +297,7 @@
- installcheck: installcheck-am
- install-strip:
- 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
--	  INSTALL_STRIP_FLAG=-s \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- 	  `test -z '$(STRIP)' || \
- 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
-@@ -272,7 +305,7 @@
- clean-generic:
- 
- distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+	-rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
- 	@echo "This command is intended for maintainers to use"
-@@ -282,13 +315,15 @@
- clean-am: clean-generic mostlyclean-am
- 
- distclean: distclean-am
--
-+	-rm -f Makefile
- distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
- dvi-am:
- 
-+html: html-am
-+
- info: info-am
- 
- info-am:
-@@ -304,7 +339,7 @@
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
--
-+	-rm -f Makefile
- maintainer-clean-am: distclean-am maintainer-clean-generic
- 
- mostlyclean: mostlyclean-am
-@@ -322,8 +357,8 @@
- uninstall-am: uninstall-info-am
- 
- .PHONY: all all-am check check-am clean clean-generic distclean \
--	distclean-generic distdir dvi dvi-am info info-am install \
--	install-am install-data install-data-am install-exec \
-+	distclean-generic distdir dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am install-exec \
- 	install-exec-am install-info install-info-am install-man \
- 	install-strip installcheck installcheck-am installdirs \
- 	maintainer-clean maintainer-clean-generic mostlyclean \
-diff -Naur flex-2.5.31.orig/filter.c flex-2.5.31/filter.c
---- flex-2.5.31.orig/filter.c	2003-03-25 16:39:08.000000000 +0000
-+++ flex-2.5.31/filter.c	2005-01-08 07:43:01.777910832 +0000
-@@ -157,11 +157,15 @@
- 		if (chain->filter_func) {
- 			int     r;
- 
--			/* setup streams again */
-+			/* setup streams again  -- Removed. POSIX states that children inherit
-+			   open streams in the parent. Also, ANSI C99 states that the stdin
-+				 and stdout macors need not be modified lvalues; so this code is 
-+				 broken in the first place.
- 			if ((stdin = fdopen (0, "r")) == NULL)
- 				flexfatal (_("fdopen(0) failed"));
- 			if ((stdout = fdopen (1, "w")) == NULL)
- 				flexfatal (_("fdopen(1) failed"));
-+      */
- 
- 			if ((r = chain->filter_func (chain)) == -1)
- 				flexfatal (_("filter_func failed"));
-@@ -181,9 +185,11 @@
- 	if (dup2 (pipes[1], 1) == -1)
- 		flexfatal (_("dup2(pipes[1],1)"));
- 	close (pipes[1]);
-+	/* This is not legal; stfout does not need to be a modifiable
-+	lvalue 
- 	if ((stdout = fdopen (1, "w")) == NULL)
- 		flexfatal (_("fdopen(1) failed"));
--
-+	*/
- 	return true;
- }
- 
-diff -Naur flex-2.5.31.orig/flex.skl flex-2.5.31/flex.skl
---- flex-2.5.31.orig/flex.skl	2003-04-01 01:51:38.000000000 +0000
-+++ flex-2.5.31/flex.skl	2005-01-08 07:43:01.794908248 +0000
-@@ -27,6 +27,11 @@
- %# Macros for runtime processing stage.
- m4_changecom
- m4_changequote
-+
-+%# Let user use our quoting strings
-+m4_changequote({, })
-+m4_define( {m4_userquote_start}, {m4_changequote(<, >)[[m4_changequote([[, ]])})
-+m4_define( {m4_userquote_end}, {m4_changequote(<, >)]]m4_changequote([[, ]])})
- m4_changequote([[, ]])
- 
- %# 
-@@ -345,19 +350,19 @@
- %#        yyscan_t yyscanner;
- %#
- %# Generate traditional function defs
--    m4_define( [[YYFARGS0]], [[(M4_YY_DEF_ONLY_ARG)
-+    m4_define( [[YYFARGS0]], [[(M4_YY_DEF_ONLY_ARG) [[\]]
-         M4_YY_DECL_LAST_ARG]])
--    m4_define( [[YYFARGS1]], [[($2 M4_YY_DEF_LAST_ARG)
--        $1 $2;
-+    m4_define( [[YYFARGS1]], [[($2 M4_YY_DEF_LAST_ARG) [[\]]
-+        $1 $2; [[\]]
-         M4_YY_DECL_LAST_ARG]])
--    m4_define( [[YYFARGS2]], [[($2,$4 M4_YY_DEF_LAST_ARG)
--        $1 $2;
--        $3 $4;
-+    m4_define( [[YYFARGS2]], [[($2,$4 M4_YY_DEF_LAST_ARG) [[\]]
-+        $1 $2; [[\]]
-+        $3 $4; [[\]]
-         M4_YY_DECL_LAST_ARG]])
--    m4_define( [[YYFARGS3]], [[($2,$4,$6 M4_YY_DEF_LAST_ARG)
--        $1 $2;
--        $3 $4;
--        $5 $6;
-+    m4_define( [[YYFARGS3]], [[($2,$4,$6 M4_YY_DEF_LAST_ARG) [[\]]
-+        $1 $2; [[\]]
-+        $3 $4; [[\]]
-+        $5 $6; [[\]]
-         M4_YY_DECL_LAST_ARG]])
- ]],
- [[
-@@ -724,6 +729,7 @@
- 
- m4_ifdef( [[M4_YY_NO_UNISTD_H]],,
- [[
-+#ifndef YY_NO_UNISTD_H
- /* Special case for "unistd.h", since it is non-ANSI. We include it way
-  * down here because we want the user's section 1 to have been scanned first.
-  * The user has a chance to override it with an option.
-@@ -734,6 +740,7 @@
- %if-c++-only
- #include <unistd.h>
- %endif
-+#endif
- ]])
- 
- #ifndef YY_EXTRA_TYPE
-@@ -1124,9 +1131,9 @@
-     m4_dnl  The bison pure parser is used. Redefine yylex to
-     m4_dnl  accept the lval parameter.
- 
--    m4_define( [[M4_YY_LEX_PROTO]],
-+    m4_define( [[M4_YY_LEX_PROTO]], [[\]]
-                [[M4_YY_PARAMS(YYSTYPE * yylval_param M4_YY_PROTO_LAST_ARG)]])
--    m4_define( [[M4_YY_LEX_DECLARATION]],
-+    m4_define( [[M4_YY_LEX_DECLARATION]], [[\]]
-                [[YYFARGS1(YYSTYPE *,yylval_param)]])
- ]])
- 
-@@ -1134,9 +1141,9 @@
- [[
-     m4_dnl  Locations are used. yylex should also accept the ylloc parameter.
- 
--    m4_define( [[M4_YY_LEX_PROTO]],
-+    m4_define( [[M4_YY_LEX_PROTO]], [[\]]
-                [[M4_YY_PARAMS(YYSTYPE * yylval_param, YYLTYPE * yylloc_param M4_YY_PROTO_LAST_ARG)]])
--    m4_define( [[M4_YY_LEX_DECLARATION]],
-+    m4_define( [[M4_YY_LEX_DECLARATION]], [[\]]
-                [[YYFARGS2(YYSTYPE *,yylval_param, YYLTYPE *,yylloc_param)]])
- ]])
- 
-@@ -2251,11 +2258,11 @@
-  * @note If you want to scan bytes that may contain NUL values, then use
-  *       yy_scan_bytes() instead.
-  */
--YY_BUFFER_STATE yy_scan_string YYFARGS1( yyconst char *,str)
-+YY_BUFFER_STATE yy_scan_string YYFARGS1( yyconst char *,yy_str)
- {
-     m4_dnl M4_YY_DECL_GUTS_VAR();
- 
--	return yy_scan_bytes( str, strlen(str) M4_YY_CALL_LAST_ARG);
-+	return yy_scan_bytes( yy_str, strlen(yy_str) M4_YY_CALL_LAST_ARG);
- }
- %endif
- ]])
-diff -Naur flex-2.5.31.orig/gen.c flex-2.5.31/gen.c
---- flex-2.5.31.orig/gen.c	2003-03-30 19:58:44.000000000 +0000
-+++ flex-2.5.31/gen.c	2005-01-08 07:43:01.804906728 +0000
-@@ -1812,7 +1812,6 @@
- 			if (yytext_is_array) {
- 				if (!reentrant){
-     				indent_puts ("static int yy_more_offset = 0;");
--                }else{
-                     indent_puts ("static int yy_prev_more_offset = 0;");
-                 }
- 			}
-diff -Naur flex-2.5.31.orig/install-sh flex-2.5.31/install-sh
---- flex-2.5.31.orig/install-sh	2003-04-01 16:32:34.000000000 +0000
-+++ flex-2.5.31/install-sh	2005-01-08 07:43:01.810905816 +0000
-@@ -1,19 +1,37 @@
- #!/bin/sh
- #
- # install - install a program, script, or datafile
--# This comes from X11R5 (mit/util/scripts/install.sh).
- #
--# Copyright 1991 by the Massachusetts Institute of Technology
-+# This originates from X11R5 (mit/util/scripts/install.sh), which was
-+# later released in X11R6 (xc/config/util/install.sh) with the
-+# following copyright and license.
- #
--# Permission to use, copy, modify, distribute, and sell this software and its
--# documentation for any purpose is hereby granted without fee, provided that
--# the above copyright notice appear in all copies and that both that
--# copyright notice and this permission notice appear in supporting
--# documentation, and that the name of M.I.T. not be used in advertising or
--# publicity pertaining to distribution of the software without specific,
--# written prior permission.  M.I.T. makes no representations about the
--# suitability of this software for any purpose.  It is provided "as is"
--# without express or implied warranty.
-+# Copyright (C) 1994 X Consortium
-+#
-+# Permission is hereby granted, free of charge, to any person obtaining a copy
-+# of this software and associated documentation files (the "Software"), to
-+# deal in the Software without restriction, including without limitation the
-+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-+# sell copies of the Software, and to permit persons to whom the Software is
-+# furnished to do so, subject to the following conditions:
-+#
-+# The above copyright notice and this permission notice shall be included in
-+# all copies or substantial portions of the Software.
-+#
-+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+#
-+# Except as contained in this notice, the name of the X Consortium shall not
-+# be used in advertising or otherwise to promote the sale, use or other deal-
-+# ings in this Software without prior written authorization from the X Consor-
-+# tium.
-+#
-+#
-+# FSF changes to this file are in the public domain.
- #
- # Calling this script install-sh is preferred over install.sh, to prevent
- # `make' implicit rules from creating a file called install from it
-@@ -56,7 +74,7 @@
- 
- while [ x"$1" != x ]; do
-     case $1 in
--	-c) instcmd="$cpprog"
-+	-c) instcmd=$cpprog
- 	    shift
- 	    continue;;
- 
-@@ -79,7 +97,7 @@
- 	    shift
- 	    continue;;
- 
--	-s) stripcmd="$stripprog"
-+	-s) stripcmd=$stripprog
- 	    shift
- 	    continue;;
- 
-@@ -106,7 +124,7 @@
- 
- if [ x"$src" = x ]
- then
--	echo "install:	no input file specified"
-+	echo "$0: no input file specified" >&2
- 	exit 1
- else
- 	:
-@@ -116,7 +134,7 @@
- 	dst=$src
- 	src=""
- 	
--	if [ -d $dst ]; then
-+	if [ -d "$dst" ]; then
- 		instcmd=:
- 		chmodcmd=""
- 	else
-@@ -132,13 +150,13 @@
- 	then
- 		:
- 	else
--		echo "install:  $src does not exist"
-+		echo "$0: $src does not exist" >&2
- 		exit 1
- 	fi
- 	
- 	if [ x"$dst" = x ]
- 	then
--		echo "install:	no destination specified"
-+		echo "$0: no destination specified" >&2
- 		exit 1
- 	else
- 		:
-@@ -147,16 +165,16 @@
- # If destination is a directory, append the input filename; if your system
- # does not like double slashes in filenames, you may need to add some logic
- 
--	if [ -d $dst ]
-+	if [ -d "$dst" ]
- 	then
--		dst="$dst"/`basename $src`
-+		dst=$dst/`basename "$src"`
- 	else
- 		:
- 	fi
- fi
- 
- ## this sed command emulates the dirname command
--dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-+dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
- 
- # Make sure that the destination directory exists.
- #  this part is taken from Noah Friedman's mkinstalldirs script
-@@ -165,48 +183,48 @@
- if [ ! -d "$dstdir" ]; then
- defaultIFS='
- 	'
--IFS="${IFS-${defaultIFS}}"
-+IFS="${IFS-$defaultIFS}"
- 
--oIFS="${IFS}"
-+oIFS=$IFS
- # Some sh's can't handle IFS=/ for some reason.
- IFS='%'
--set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
--IFS="${oIFS}"
-+set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
-+IFS=$oIFS
- 
- pathcomp=''
- 
- while [ $# -ne 0 ] ; do
--	pathcomp="${pathcomp}${1}"
-+	pathcomp=$pathcomp$1
- 	shift
- 
--	if [ ! -d "${pathcomp}" ] ;
-+	if [ ! -d "$pathcomp" ] ;
-         then
--		$mkdirprog "${pathcomp}"
-+		$mkdirprog "$pathcomp"
- 	else
- 		:
- 	fi
- 
--	pathcomp="${pathcomp}/"
-+	pathcomp=$pathcomp/
- done
- fi
- 
- if [ x"$dir_arg" != x ]
- then
--	$doit $instcmd $dst &&
-+	$doit $instcmd "$dst" &&
- 
--	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi &&
--	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi &&
--	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else : ; fi &&
--	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else : ; fi
-+	if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi &&
-+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi &&
-+	if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi &&
-+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi
- else
- 
- # If we're going to rename the final executable, determine the name now.
- 
- 	if [ x"$transformarg" = x ] 
- 	then
--		dstfile=`basename $dst`
-+		dstfile=`basename "$dst"`
- 	else
--		dstfile=`basename $dst $transformbasename | 
-+		dstfile=`basename "$dst" $transformbasename |
- 			sed $transformarg`$transformbasename
- 	fi
- 
-@@ -214,20 +232,24 @@
- 
- 	if [ x"$dstfile" = x ] 
- 	then
--		dstfile=`basename $dst`
-+		dstfile=`basename "$dst"`
- 	else
- 		:
- 	fi
- 
--# Make a temp file name in the proper directory.
-+# Make a couple of temp file names in the proper directory.
- 
--	dsttmp=$dstdir/#inst.$$#
-+	dsttmp=$dstdir/_inst.$$_
-+	rmtmp=$dstdir/_rm.$$_
- 
--# Move or copy the file name to the temp name
-+# Trap to clean up temp files at exit.
- 
--	$doit $instcmd $src $dsttmp &&
-+	trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
-+	trap '(exit $?); exit' 1 2 13 15
- 
--	trap "rm -f ${dsttmp}" 0 &&
-+# Move or copy the file name to the temp name
-+
-+	$doit $instcmd "$src" "$dsttmp" &&
- 
- # and set any options; do chmod last to preserve setuid bits
- 
-@@ -235,17 +257,38 @@
- # ignore errors from any of these, just make sure not to ignore
- # errors from the above "$doit $instcmd $src $dsttmp" command.
- 
--	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else :;fi &&
--	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else :;fi &&
--	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else :;fi &&
--	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else :;fi &&
-+	if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi &&
-+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi &&
-+	if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi &&
-+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi &&
-+
-+# Now remove or move aside any old file at destination location.  We try this
-+# two ways since rm can't unlink itself on some systems and the destination
-+# file might be busy for other reasons.  In this case, the final cleanup
-+# might fail but the new file should still install successfully.
-+
-+{
-+	if [ -f "$dstdir/$dstfile" ]
-+	then
-+		$doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null ||
-+		$doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null ||
-+		{
-+		  echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-+		  (exit 1); exit
-+		}
-+	else
-+		:
-+	fi
-+} &&
- 
- # Now rename the file to the real destination.
- 
--	$doit $rmcmd -f $dstdir/$dstfile &&
--	$doit $mvcmd $dsttmp $dstdir/$dstfile 
-+	$doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
- 
- fi &&
- 
-+# The final little trick to "correctly" pass the exit status to the exit trap.
- 
--exit 0
-+{
-+	(exit 0); exit
-+}
-diff -Naur flex-2.5.31.orig/m4/Makefile.in flex-2.5.31/m4/Makefile.in
---- flex-2.5.31.orig/m4/Makefile.in	2003-04-01 16:32:36.000000000 +0000
-+++ flex-2.5.31/m4/Makefile.in	2005-01-08 07:43:01.854899128 +0000
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.7 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # @configure_input@
- 
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -13,7 +13,6 @@
- # PARTICULAR PURPOSE.
- 
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -21,7 +20,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -36,6 +34,21 @@
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
- host_triplet = @host@
-+subdir = m4
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
-+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -75,12 +88,16 @@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
- LIBICONV = @LIBICONV@
- LIBINTL = @LIBINTL@
-+LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LN_S = @LN_S@
- LTLIBICONV = @LTLIBICONV@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- M4 = @M4@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
-@@ -111,6 +128,7 @@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
- am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
- bindir = @bindir@
- build = @build@
-@@ -132,6 +150,7 @@
- libexecdir = @libexecdir@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-@@ -140,20 +159,38 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- EXTRA_DIST = codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes-pri.m4 inttypes.m4 inttypes_h.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 progtest.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4
--subdir = m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--DIST_COMMON = Makefile.am Makefile.in
- all: all-am
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  m4/Makefile'; \
- 	cd $(top_srcdir) && \
- 	  $(AUTOMAKE) --gnu  m4/Makefile
--Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- uninstall-info-am:
- tags: TAGS
- TAGS:
-@@ -161,22 +198,20 @@
- ctags: CTAGS
- CTAGS:
- 
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--
--top_distdir = ..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
- 
- distdir: $(DISTFILES)
- 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- 	list='$(DISTFILES)'; for file in $$list; do \
- 	  case $$file in \
- 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- 	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- 	    dir="/$$dir"; \
--	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
- 	  else \
- 	    dir=''; \
- 	  fi; \
-@@ -194,9 +229,7 @@
- check-am: all-am
- check: check-am
- all-am: Makefile
--
- installdirs:
--
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -208,7 +241,7 @@
- installcheck: installcheck-am
- install-strip:
- 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
--	  INSTALL_STRIP_FLAG=-s \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- 	  `test -z '$(STRIP)' || \
- 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
-@@ -216,7 +249,7 @@
- clean-generic:
- 
- distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+	-rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
- 	@echo "This command is intended for maintainers to use"
-@@ -226,13 +259,15 @@
- clean-am: clean-generic mostlyclean-am
- 
- distclean: distclean-am
--
-+	-rm -f Makefile
- distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
- dvi-am:
- 
-+html: html-am
-+
- info: info-am
- 
- info-am:
-@@ -248,7 +283,7 @@
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
--
-+	-rm -f Makefile
- maintainer-clean-am: distclean-am maintainer-clean-generic
- 
- mostlyclean: mostlyclean-am
-@@ -266,8 +301,8 @@
- uninstall-am: uninstall-info-am
- 
- .PHONY: all all-am check check-am clean clean-generic distclean \
--	distclean-generic distdir dvi dvi-am info info-am install \
--	install-am install-data install-data-am install-exec \
-+	distclean-generic distdir dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am install-exec \
- 	install-exec-am install-info install-info-am install-man \
- 	install-strip installcheck installcheck-am installdirs \
- 	maintainer-clean maintainer-clean-generic mostlyclean \
-diff -Naur flex-2.5.31.orig/main.c flex-2.5.31/main.c
---- flex-2.5.31.orig/main.c	2003-04-01 01:51:38.000000000 +0000
-+++ flex-2.5.31/main.c	2005-01-08 07:43:01.863897760 +0000
-@@ -199,6 +199,7 @@
- {
- #if ENABLE_NLS
- 	setlocale (LC_MESSAGES, "");
-+	setlocale (LC_CTYPE, "");
- 	textdomain (PACKAGE);
- 	bindtextdomain (PACKAGE, LOCALEDIR);
- #endif
-@@ -1595,7 +1596,6 @@
- 			outn ("#else");
- 			outn (yy_stdinit);
- 			outn ("#endif");
--			outn ("#endif");
- 		}
- 
- 		else {
-diff -Naur flex-2.5.31.orig/missing flex-2.5.31/missing
---- flex-2.5.31.orig/missing	2003-04-01 16:32:34.000000000 +0000
-+++ flex-2.5.31/missing	2005-01-08 07:43:01.867897152 +0000
-@@ -1,6 +1,6 @@
- #! /bin/sh
- # Common stub for a few missing GNU programs while installing.
--# Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
-+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
- # Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
- 
- # This program is free software; you can redistribute it and/or modify
-@@ -165,7 +165,7 @@
- WARNING: \`$1' is needed, and you do not seem to have it handy on your
-          system.  You might have modified some files without having the
-          proper tools for further handling them.
--         You can get \`$1Help2man' as part of \`Autoconf' from any GNU
-+         You can get \`$1' as part of \`Autoconf' from any GNU
-          archive site."
- 
-     file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
-@@ -326,7 +326,7 @@
- WARNING: \`$1' is needed, and you do not seem to have it handy on your
-          system.  You might have modified some files without having the
-          proper tools for further handling them.  Check the \`README' file,
--         it often tells you about the needed prerequirements for installing
-+         it often tells you about the needed prerequisites for installing
-          this package.  You may also peek at any GNU archive site, in case
-          some other package would contain this missing \`$1' program."
-     exit 1
-diff -Naur flex-2.5.31.orig/mkinstalldirs flex-2.5.31/mkinstalldirs
---- flex-2.5.31.orig/mkinstalldirs	2003-04-01 16:32:21.000000000 +0000
-+++ flex-2.5.31/mkinstalldirs	2005-01-08 07:43:01.870896696 +0000
-@@ -4,9 +4,66 @@
- # Created: 1993-05-16
- # Public domain
- 
--# $Id: mkinstalldirs,v 1.1.1.1 2002/07/16 23:37:48 bruno Exp $
--
- errstatus=0
-+dirmode=""
-+
-+usage="\
-+Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
-+
-+# process command line arguments
-+while test $# -gt 0 ; do
-+  case $1 in
-+    -h | --help | --h*)         # -h for help
-+      echo "$usage" 1>&2
-+      exit 0
-+      ;;
-+    -m)                         # -m PERM arg
-+      shift
-+      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
-+      dirmode=$1
-+      shift
-+      ;;
-+    --)                         # stop option processing
-+      shift
-+      break
-+      ;;
-+    -*)                         # unknown option
-+      echo "$usage" 1>&2
-+      exit 1
-+      ;;
-+    *)                          # first non-opt arg
-+      break
-+      ;;
-+  esac
-+done
-+
-+for file
-+do
-+  if test -d "$file"; then
-+    shift
-+  else
-+    break
-+  fi
-+done
-+
-+case $# in
-+  0) exit 0 ;;
-+esac
-+
-+case $dirmode in
-+  '')
-+    if mkdir -p -- . 2>/dev/null; then
-+      echo "mkdir -p -- $*"
-+      exec mkdir -p -- "$@"
-+    fi
-+    ;;
-+  *)
-+    if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
-+      echo "mkdir -m $dirmode -p -- $*"
-+      exec mkdir -m "$dirmode" -p -- "$@"
-+    fi
-+    ;;
-+esac
- 
- for file
- do
-@@ -17,7 +74,7 @@
-    for d
-    do
-      pathcomp="$pathcomp$d"
--     case "$pathcomp" in
-+    case $pathcomp in
-        -* ) pathcomp=./$pathcomp ;;
-      esac
- 
-@@ -28,6 +85,16 @@
- 
-         if test ! -d "$pathcomp"; then
-   	  errstatus=$lasterr
-+      else
-+  	if test ! -z "$dirmode"; then
-+	  echo "chmod $dirmode $pathcomp"
-+    	  lasterr=""
-+  	  chmod "$dirmode" "$pathcomp" || lasterr=$?
-+
-+  	  if test ! -z "$lasterr"; then
-+  	    errstatus=$lasterr
-+  	  fi
-+  	fi
-         fi
-      fi
- 
-@@ -37,4 +104,8 @@
- 
- exit $errstatus
- 
-+# Local Variables:
-+# mode: shell-script
-+# sh-indentation: 2
-+# End:
- # mkinstalldirs ends here
-diff -Naur flex-2.5.31.orig/po/Makefile flex-2.5.31/po/Makefile
---- flex-2.5.31.orig/po/Makefile	1970-01-01 00:00:00.000000000 +0000
-+++ flex-2.5.31/po/Makefile	2005-01-08 07:43:01.923888640 +0000
-@@ -0,0 +1,402 @@
-+# Makefile for PO directory in any package using GNU gettext.
-+# Copyright (C) 1995-1997, 2000-2002 by Ulrich Drepper <drepper at gnu.ai.mit.edu>
-+#
-+# This file can be copied and used freely without restrictions.  It can
-+# be used in projects which are not available under the GNU General Public
-+# License but which still want to provide support for the GNU gettext
-+# functionality.
-+# Please note that the actual code of GNU gettext is covered by the GNU
-+# General Public License and is *not* in the public domain.
-+
-+PACKAGE = flex
-+VERSION = 2.5.31
-+
-+SHELL = /bin/sh
-+
-+
-+srcdir = .
-+top_srcdir = ..
-+
-+
-+prefix = /usr
-+exec_prefix = ${prefix}
-+datadir = ${prefix}/share
-+localedir = $(datadir)/locale
-+gettextsrcdir = $(datadir)/gettext/po
-+
-+INSTALL = /usr/bin/install -c
-+INSTALL_DATA = ${INSTALL} -m 644
-+MKINSTALLDIRS = $(top_builddir)/./mkinstalldirs
-+mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/mkinstalldirs" ;; esac`
-+
-+GMSGFMT = /usr/bin/msgfmt
-+MSGFMT = /usr/bin/msgfmt
-+XGETTEXT = /usr/bin/xgettext
-+MSGMERGE = msgmerge
-+MSGMERGE_UPDATE = /usr/bin/msgmerge --update
-+MSGINIT = msginit
-+MSGCONV = msgconv
-+MSGFILTER = msgfilter
-+
-+POFILES =  ca.po da.po de.po es.po ru.po sv.po tr.po fr.po ko.po zh_CN.po pt_BR.po
-+GMOFILES =  ca.gmo da.gmo de.gmo es.gmo ru.gmo sv.gmo tr.gmo fr.gmo ko.gmo zh_CN.gmo pt_BR.gmo
-+UPDATEPOFILES =  ca.po-update da.po-update de.po-update es.po-update ru.po-update sv.po-update tr.po-update fr.po-update ko.po-update zh_CN.po-update pt_BR.po-update
-+DUMMYPOFILES =  ca.nop da.nop de.nop es.nop ru.nop sv.nop tr.nop fr.nop ko.nop zh_CN.nop pt_BR.nop
-+DISTFILES.common = Makefile.in.in Makevars remove-potcdate.sin \
-+$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3)
-+DISTFILES = $(DISTFILES.common) POTFILES.in $(DOMAIN).pot \
-+$(POFILES) $(GMOFILES) \
-+$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)
-+
-+POTFILES = \
-+     ../buf.c \
-+     ../ccl.c \
-+     ../dfa.c \
-+     ../ecs.c \
-+     ../gen.c \
-+     ../libmain.c \
-+     ../libyywrap.c \
-+     ../main.c \
-+     ../misc.c \
-+     ../nfa.c \
-+     ../options.c \
-+     ../parse.y \
-+     ../scan.l \
-+     ../scanopt.c \
-+     ../skel.c \
-+     ../sym.c \
-+     ../tblcmp.c \
-+     ../yylex.c
-+
-+CATALOGS =  ca.gmo da.gmo de.gmo es.gmo ru.gmo sv.gmo tr.gmo fr.gmo ko.gmo zh_CN.gmo pt_BR.gmo
-+
-+# Makevars gets inserted here. (Don't remove this line!)
-+# Makefile variables for PO directory in any package using GNU gettext.
-+
-+# Usually the message domain is the same as the package name.
-+DOMAIN = $(PACKAGE)
-+
-+# These two variables depend on the location of this directory.
-+subdir = po
-+top_builddir = ..
-+
-+# These options get passed to xgettext.
-+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
-+
-+# This is the copyright holder that gets inserted into the header of the
-+# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
-+# package.  (Note that the msgstr strings, extracted from the package's
-+# sources, belong to the copyright holder of the package.)  Translators are
-+# expected to transfer the copyright for their translations to this person
-+# or entity, or to disclaim their copyright.  The empty string stands for
-+# the public domain; in this case the translators are expected to disclaim
-+# their copyright.
-+COPYRIGHT_HOLDER = 
-+
-+# This is the list of locale categories, beyond LC_MESSAGES, for which the
-+# message catalogs shall be used.  It is usually empty.
-+EXTRA_LOCALE_CATEGORIES =
-+
-+.SUFFIXES:
-+.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-update
-+
-+.po.mo:
-+	@echo "$(MSGFMT) -c -o $@ $<"; \
-+	$(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
-+
-+.po.gmo:
-+	@lang=`echo $* | sed -e 's,.*/,,'`; \
-+	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-+	echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \
-+	cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
-+
-+.sin.sed:
-+	sed -e '/^#/d' $< > t-$@
-+	mv t-$@ $@
-+
-+
-+all: all-yes
-+
-+all-yes: $(CATALOGS)
-+all-no:
-+
-+# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
-+# otherwise packages like GCC can not be built if only parts of the source
-+# have been downloaded.
-+
-+$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
-+	$(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-+	  --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
-+	  --files-from=$(srcdir)/POTFILES.in \
-+	  --copyright-holder='$(COPYRIGHT_HOLDER)'
-+	test ! -f $(DOMAIN).po || { \
-+	  if test -f $(srcdir)/$(DOMAIN).pot; then \
-+	    sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
-+	    sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \
-+	    if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \
-+	      rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \
-+	    else \
-+	      rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \
-+	      mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
-+	    fi; \
-+	  else \
-+	    mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
-+	  fi; \
-+	}
-+
-+$(srcdir)/$(DOMAIN).pot:
-+	$(MAKE) $(DOMAIN).pot-update
-+
-+$(POFILES): $(srcdir)/$(DOMAIN).pot
-+	@lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
-+	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-+	echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
-+	cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot
-+
-+
-+install: install-exec install-data
-+install-exec:
-+install-data: install-data-yes
-+	if test "$(PACKAGE)" = "gettext"; then \
-+	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
-+	  for file in $(DISTFILES.common); do \
-+	    $(INSTALL_DATA) $(srcdir)/$$file \
-+			    $(DESTDIR)$(gettextsrcdir)/$$file; \
-+	  done; \
-+	else \
-+	  : ; \
-+	fi
-+install-data-no: all
-+install-data-yes: all
-+	$(mkinstalldirs) $(DESTDIR)$(datadir)
-+	@catalogs='$(CATALOGS)'; \
-+	for cat in $$catalogs; do \
-+	  cat=`basename $$cat`; \
-+	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
-+	  dir=$(localedir)/$$lang/LC_MESSAGES; \
-+	  $(mkinstalldirs) $(DESTDIR)$$dir; \
-+	  if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
-+	  $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
-+	  echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
-+	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
-+	    if test -n "$$lc"; then \
-+	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
-+	        link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
-+	        mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
-+	        mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
-+	        (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
-+	         for file in *; do \
-+	           if test -f $$file; then \
-+	             ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
-+	           fi; \
-+	         done); \
-+	        rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
-+	      else \
-+	        if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
-+	          :; \
-+	        else \
-+	          rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
-+	          mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
-+	        fi; \
-+	      fi; \
-+	      rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
-+	      ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
-+	      ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
-+	      cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
-+	      echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \
-+	    fi; \
-+	  done; \
-+	done
-+
-+install-strip: install
-+
-+installdirs: installdirs-exec installdirs-data
-+installdirs-exec:
-+installdirs-data: installdirs-data-yes
-+	if test "$(PACKAGE)" = "gettext"; then \
-+	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
-+	else \
-+	  : ; \
-+	fi
-+installdirs-data-no:
-+installdirs-data-yes:
-+	$(mkinstalldirs) $(DESTDIR)$(datadir)
-+	@catalogs='$(CATALOGS)'; \
-+	for cat in $$catalogs; do \
-+	  cat=`basename $$cat`; \
-+	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
-+	  dir=$(localedir)/$$lang/LC_MESSAGES; \
-+	  $(mkinstalldirs) $(DESTDIR)$$dir; \
-+	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
-+	    if test -n "$$lc"; then \
-+	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
-+	        link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
-+	        mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
-+	        mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
-+	        (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
-+	         for file in *; do \
-+	           if test -f $$file; then \
-+	             ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
-+	           fi; \
-+	         done); \
-+	        rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
-+	      else \
-+	        if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
-+	          :; \
-+	        else \
-+	          rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
-+	          mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
-+	        fi; \
-+	      fi; \
-+	    fi; \
-+	  done; \
-+	done
-+
-+# Define this as empty until I found a useful application.
-+installcheck:
-+
-+uninstall: uninstall-exec uninstall-data
-+uninstall-exec:
-+uninstall-data: uninstall-data-yes
-+	if test "$(PACKAGE)" = "gettext"; then \
-+	  for file in $(DISTFILES.common); do \
-+	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
-+	  done; \
-+	else \
-+	  : ; \
-+	fi
-+uninstall-data-no:
-+uninstall-data-yes:
-+	catalogs='$(CATALOGS)'; \
-+	for cat in $$catalogs; do \
-+	  cat=`basename $$cat`; \
-+	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
-+	  for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \
-+	    rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
-+	  done; \
-+	done
-+
-+check: all
-+
-+dvi info tags TAGS ID:
-+
-+mostlyclean:
-+	rm -f remove-potcdate.sed
-+	rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
-+	rm -fr *.o
-+
-+clean: mostlyclean
-+
-+distclean: clean
-+	rm -f Makefile Makefile.in POTFILES *.mo
-+
-+maintainer-clean: distclean
-+	@echo "This command is intended for maintainers to use;"
-+	@echo "it deletes files that may require special tools to rebuild."
-+	rm -f $(GMOFILES)
-+
-+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-+dist distdir:
-+	$(MAKE) update-po
-+	@$(MAKE) dist2
-+# This is a separate target because 'update-po' must be executed before.
-+dist2: $(DISTFILES)
-+	dists="$(DISTFILES)"; \
-+	if test -f $(srcdir)/ChangeLog; then dists="$$dists ChangeLog"; fi; \
-+	if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
-+	for file in $$dists; do \
-+	  if test -f $$file; then \
-+	    cp -p $$file $(distdir); \
-+	  else \
-+	    cp -p $(srcdir)/$$file $(distdir); \
-+	  fi; \
-+	done
-+
-+update-po: Makefile
-+	$(MAKE) $(DOMAIN).pot-update
-+	$(MAKE) $(UPDATEPOFILES)
-+	$(MAKE) update-gmo
-+
-+# General rule for updating PO files.
-+
-+.nop.po-update:
-+	@lang=`echo $@ | sed -e 's/\.po-update$$//'`; \
-+	if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; fi; \
-+	tmpdir=`pwd`; \
-+	echo "$$lang:"; \
-+	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-+	echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
-+	cd $(srcdir); \
-+	if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \
-+	  if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
-+	    rm -f $$tmpdir/$$lang.new.po; \
-+	  else \
-+	    if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
-+	      :; \
-+	    else \
-+	      echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
-+	      exit 1; \
-+	    fi; \
-+	  fi; \
-+	else \
-+	  echo "msgmerge for $$lang.po failed!" 1>&2; \
-+	  rm -f $$tmpdir/$$lang.new.po; \
-+	fi
-+
-+$(DUMMYPOFILES):
-+
-+update-gmo: Makefile $(GMOFILES)
-+	@:
-+
-+Makefile: Makefile.in.in $(top_builddir)/config.status POTFILES.in
-+	cd $(top_builddir) \
-+	  && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
-+	       $(SHELL) ./config.status
-+
-+force:
-+
-+# Tell versions [3.59,3.63) of GNU make not to export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-+# Special Makefile rules for English message catalogs with quotation marks.
-+
-+DISTFILES.common.extra1 = quot.sed boldquot.sed en at quot.header en at boldquot.header insert-header.sin Rules-quot
-+
-+.SUFFIXES: .insert-header .po-update-en
-+
-+en at quot.po-update: en at quot.po-update-en
-+en at boldquot.po-update: en at boldquot.po-update-en
-+
-+.insert-header.po-update-en:
-+	@lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \
-+	if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
-+	tmpdir=`pwd`; \
-+	echo "$$lang:"; \
-+	ll=`echo $$lang | sed -e 's/@.*//'`; \
-+	LC_ALL=C; export LC_ALL; \
-+	cd $(srcdir); \
-+	if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$ll -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \
-+	  if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
-+	    rm -f $$tmpdir/$$lang.new.po; \
-+	  else \
-+	    if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
-+	      :; \
-+	    else \
-+	      echo "creation of $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
-+	      exit 1; \
-+	    fi; \
-+	  fi; \
-+	else \
-+	  echo "creation of $$lang.po failed!" 1>&2; \
-+	  rm -f $$tmpdir/$$lang.new.po; \
-+	fi
-+
-+en at quot.insert-header: insert-header.sin
-+	sed -e '/^#/d' -e 's/HEADER/en at quot.header/g' $(srcdir)/insert-header.sin > en at quot.insert-header
-+
-+en at boldquot.insert-header: insert-header.sin
-+	sed -e '/^#/d' -e 's/HEADER/en at boldquot.header/g' $(srcdir)/insert-header.sin > en at boldquot.insert-header
-+
-+mostlyclean: mostlyclean-quot
-+mostlyclean-quot:
-+	rm -f *.insert-header
-diff -Naur flex-2.5.31.orig/po/Makefile.in.in flex-2.5.31/po/Makefile.in.in
---- flex-2.5.31.orig/po/Makefile.in.in	2003-04-01 16:32:21.000000000 +0000
-+++ flex-2.5.31/po/Makefile.in.in	2005-01-08 07:43:01.927888032 +0000
-@@ -27,7 +27,7 @@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- MKINSTALLDIRS = @MKINSTALLDIRS@
--mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
-+mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/mkinstalldirs" ;; esac`
- 
- GMSGFMT = @GMSGFMT@
- MSGFMT = @MSGFMT@
-diff -Naur flex-2.5.31.orig/po/nl.po flex-2.5.31/po/nl.po
---- flex-2.5.31.orig/po/nl.po	1970-01-01 00:00:00.000000000 +0000
-+++ flex-2.5.31/po/nl.po	2005-01-08 07:43:01.936886664 +0000
-@@ -0,0 +1,899 @@
-+# SOME DESCRIPTIVE TITLE.
-+# This file is put in the public domain.
-+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
-+# 
-+msgid ""
-+msgstr ""
-+"Project-Id-Version: flex 2.5.31-30\n"
-+"Report-Msgid-Bugs-To: \n"
-+"POT-Creation-Date: 2004-12-02 18:35+0100\n"
-+"PO-Revision-Date: 2004-12-02 18:34+0100\n"
-+"Last-Translator: Luk Claes <luk.claes at ugent.be>\n"
-+"Language-Team: Debian l10n Dutch <debian-l10n-dutch at lists.debian.org>\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=utf-8\n"
-+"Content-Transfer-Encoding: 8bit\n"
-+
-+#: dfa.c:61
-+#, c-format
-+msgid "State #%d is non-accepting -\n"
-+msgstr "Toestand #%d is niet-aanvaarden -\n"
-+
-+#: dfa.c:124
-+msgid "dangerous trailing context"
-+msgstr "gevaarlijke vervolgcontext"
-+
-+#: dfa.c:166
-+#, c-format
-+msgid " associated rule line numbers:"
-+msgstr "geassocieerde regelnummers:"
-+
-+#: dfa.c:202
-+#, c-format
-+msgid " out-transitions: "
-+msgstr "uit-transities:"
-+
-+#: dfa.c:210
-+#, c-format
-+msgid ""
-+"\n"
-+" jam-transitions: EOF "
-+msgstr ""
-+"\n"
-+" jam-transities: EOF"
-+
-+#: dfa.c:341
-+msgid "consistency check failed in epsclosure()"
-+msgstr "consistentiecontrole faalde in epsclosure()"
-+
-+#: dfa.c:429
-+msgid ""
-+"\n"
-+"\n"
-+"DFA Dump:\n"
-+"\n"
-+msgstr ""
-+"\n"
-+"\n"
-+"DFA-dump:\n"
-+"\n"
-+
-+#: dfa.c:604
-+msgid "could not create unique end-of-buffer state"
-+msgstr "kon unieke einde-van-buffer-toestand niet aanmaken"
-+
-+#: dfa.c:625
-+#, c-format
-+msgid "state # %d:\n"
-+msgstr "toestand # %d:\n"
-+
-+#: dfa.c:800
-+msgid "Could not write yynxt_tbl[][]"
-+msgstr "Kon yynxt_tbl[][] niet schrijven"
-+
-+#: dfa.c:1023
-+msgid "consistency check failed in symfollowset"
-+msgstr "consistentiecontrole faalde in symboolvervolgverzameling"
-+
-+#: dfa.c:1071
-+msgid "bad transition character detected in sympartition()"
-+msgstr "er is een slecht transitiekarakter gedetecteerd in sympartition()"
-+
-+#: gen.c:484
-+msgid ""
-+"\n"
-+"\n"
-+"Equivalence Classes:\n"
-+"\n"
-+msgstr ""
-+"\n"
-+"\n"
-+"Equivalentieklassen:\n"
-+"\n"
-+
-+#: gen.c:668 gen.c:697 gen.c:1221
-+#, c-format
-+msgid "state # %d accepts: [%d]\n"
-+msgstr "toestand # %d aanvaardt: [%d]\n"
-+
-+#: gen.c:1116
-+#, c-format
-+msgid "state # %d accepts: "
-+msgstr "toestand # %d aanvaardt:"
-+
-+#: gen.c:1163
-+msgid "Could not write yyacclist_tbl"
-+msgstr "Kon yyacclist_tbl niet schrijven"
-+
-+#: gen.c:1239
-+msgid "Could not write yyacc_tbl"
-+msgstr "Kon yyacc_tbl niet schrijven"
-+
-+#: gen.c:1254 gen.c:1639 gen.c:1662
-+msgid "Could not write ecstbl"
-+msgstr "Kon ecstbl niet schrijven"
-+
-+#: gen.c:1277
-+msgid ""
-+"\n"
-+"\n"
-+"Meta-Equivalence Classes:\n"
-+msgstr ""
-+"\n"
-+"\n"
-+"Meta-equivalentieklassen:\n"
-+
-+#: gen.c:1299
-+msgid "Could not write yymeta_tbl"
-+msgstr "Kon yymeta_tbl niet schrijven"
-+
-+#: gen.c:1360
-+msgid "Could not write yybase_tbl"
-+msgstr "Kon yybase_tbl niet schrijven"
-+
-+#: gen.c:1394
-+msgid "Could not write yydef_tbl"
-+msgstr "Kon yydef_tbl niet schrijven"
-+
-+#: gen.c:1434
-+msgid "Could not write yynxt_tbl"
-+msgstr "Kon yynxt_tbl niet schrijven"
-+
-+#: gen.c:1470
-+msgid "Could not write yychk_tbl"
-+msgstr "Kon yychk_tbl niet schrijven"
-+
-+#: gen.c:1624 gen.c:1653
-+msgid "Could not write ftbl"
-+msgstr "Kon ftbl niet schrijven"
-+
-+#: gen.c:1630
-+msgid "Could not write ssltbl"
-+msgstr "Kon ssltbl niet schrijven"
-+
-+#: gen.c:1681
-+msgid "Could not write eoltbl"
-+msgstr "Kon eoltbl niet schrijven"
-+
-+#: gen.c:1741
-+msgid "Could not write yynultrans_tbl"
-+msgstr "Kon yynultrans_tbl niet schrijven"
-+
-+#: main.c:176
-+msgid "rule cannot be matched"
-+msgstr "regel komt niet overeen"
-+
-+#: main.c:181
-+msgid "-s option given but default rule can be matched"
-+msgstr "optie -s gegeven, maar standaard regel komt niet overeen"
-+
-+#: main.c:218
-+msgid "Can't use -+ with -l option"
-+msgstr "Kan -+ niet gebruiken bij optie -l"
-+
-+#: main.c:221
-+msgid "Can't use -f or -F with -l option"
-+msgstr "Kan -f of -F niet gebruiken met optie -l"
-+
-+#: main.c:225
-+msgid "Can't use --reentrant or --bison-bridge with -l option"
-+msgstr "Kan --reentrant of --bison-bridge niet gebruiken met optie -l"
-+
-+#: main.c:262
-+msgid "-Cf/-CF and -Cm don't make sense together"
-+msgstr "-Cf/-CF en -Cm gaan niet samen"
-+
-+#: main.c:265
-+msgid "-Cf/-CF and -I are incompatible"
-+msgstr "-Cf/-CF en -l zijn incompatibel"
-+
-+#: main.c:269
-+msgid "-Cf/-CF are incompatible with lex-compatibility mode"
-+msgstr "-Cf/-CF zijn incompatibel met lex-compatibiliteitsmodus"
-+
-+#: main.c:274
-+msgid "-Cf and -CF are mutually exclusive"
-+msgstr "-Cf en -CF zijn mutueel exclusief"
-+
-+#: main.c:278
-+msgid "Can't use -+ with -CF option"
-+msgstr "Kan -+ niet gebruiken met optie -CF"
-+
-+#: main.c:281
-+#, c-format
-+msgid "%array incompatible with -+ option"
-+msgstr "%array incompatibel met optie -+"
-+
-+#: main.c:286
-+msgid "Options -+ and --reentrant are mutually exclusive."
-+msgstr "Opties -+ en --reentrant zijn mutueel exclusief."
-+
-+#: main.c:289
-+msgid "bison bridge not supported for the C++ scanner."
-+msgstr "bison-brug niet ondersteund voor de C++-scanner."
-+
-+#: main.c:341 main.c:386
-+#, c-format
-+msgid "could not create %s"
-+msgstr "kon %s niet aanmaken"
-+
-+#: main.c:399
-+msgid "could not write tables header"
-+msgstr "kon tabellenheader niet schrijven"
-+
-+#: main.c:403
-+#, c-format
-+msgid "can't open skeleton file %s"
-+msgstr "kan skeletbestand %s niet openen"
-+
-+#: main.c:484
-+#, c-format
-+msgid "input error reading skeleton file %s"
-+msgstr "invoerfout bij het lezen van skeletbestand %s"
-+
-+#: main.c:488
-+#, c-format
-+msgid "error closing skeleton file %s"
-+msgstr "fout bij het sluiten van skeletbestand %s"
-+
-+#: main.c:672
-+#, c-format
-+msgid "error creating header file %s"
-+msgstr "fout bij het aanmaken van headerbestand %s"
-+
-+#: main.c:680
-+#, c-format
-+msgid "error writing output file %s"
-+msgstr "fout bij het schrijven van uitvoerbestand %s"
-+
-+#: main.c:684
-+#, c-format
-+msgid "error closing output file %s"
-+msgstr "fout bij het sluiten van uitvoerbestand %s"
-+
-+#: main.c:688
-+#, c-format
-+msgid "error deleting output file %s"
-+msgstr "fout bij het verwijderen van uitvoerbestand %s"
-+
-+#: main.c:695
-+#, c-format
-+msgid "No backing up.\n"
-+msgstr "Geen reservekopie.\n"
-+
-+#: main.c:699
-+#, c-format
-+msgid "%d backing up (non-accepting) states.\n"
-+msgstr "%d gemaakte reservekopies (niet-aanvaardende) toestanden.\n"
-+
-+#: main.c:703
-+#, c-format
-+msgid "Compressed tables always back up.\n"
-+msgstr "Gecomprimeerde tabellen hebben altijd reservekopies.\n"
-+
-+#: main.c:706
-+#, c-format
-+msgid "error writing backup file %s"
-+msgstr "fout bij het schrijven van reservekopie %s"
-+
-+#: main.c:710
-+#, c-format
-+msgid "error closing backup file %s"
-+msgstr "fout bij het sluiten van reservekopie %s"
-+
-+#: main.c:715
-+#, c-format
-+msgid "%s version %s usage statistics:\n"
-+msgstr "%s versie %s gebruikstatistieken:\n"
-+
-+#: main.c:718
-+#, c-format
-+msgid "  scanner options: -"
-+msgstr "  scanner-opties: -"
-+
-+#: main.c:797
-+#, c-format
-+msgid "  %d/%d NFA states\n"
-+msgstr "  %d/%d NFA-toestanden\n"
-+
-+#: main.c:799
-+#, c-format
-+msgid "  %d/%d DFA states (%d words)\n"
-+msgstr "  %d/%d DFA-toestanden (%d woorden)\n"
-+
-+#: main.c:801
-+#, c-format
-+msgid "  %d rules\n"
-+msgstr "  %d regels\n"
-+
-+#: main.c:806
-+#, c-format
-+msgid "  No backing up\n"
-+msgstr "  Geen reservekopie\n"
-+
-+#: main.c:810
-+#, c-format
-+msgid "  %d backing-up (non-accepting) states\n"
-+msgstr "  %d gemaakte reservekopies (niet-aanvaardende) toestanden\n"
-+
-+#: main.c:815
-+#, c-format
-+msgid "  Compressed tables always back-up\n"
-+msgstr "  Gecomprimeerde tabellen hebben altijd reservekopies\n"
-+
-+#: main.c:819
-+#, c-format
-+msgid "  Beginning-of-line patterns used\n"
-+msgstr "  Begin-van-de-regel-patronen gebruikt\n"
-+
-+#: main.c:821
-+#, c-format
-+msgid "  %d/%d start conditions\n"
-+msgstr "  %d/%d startvoorwaarden\n"
-+
-+#: main.c:825
-+#, c-format
-+msgid "  %d epsilon states, %d double epsilon states\n"
-+msgstr "  %d epsilon-toestanden, %d dubbele epsilon-toestanden\n"
-+
-+#: main.c:829
-+#, c-format
-+msgid "  no character classes\n"
-+msgstr "  geen karakterklassen\n"
-+
-+#: main.c:833
-+#, c-format
-+msgid "  %d/%d character classes needed %d/%d words of storage, %d reused\n"
-+msgstr ""
-+"  %d/%d karakterklassen hebben %d/%d woorden nodig voor opslag, %d gebruikt\n"
-+
-+#: main.c:838
-+#, c-format
-+msgid "  %d state/nextstate pairs created\n"
-+msgstr "  %d transities aangemaakt\n"
-+
-+#: main.c:841
-+#, c-format
-+msgid "  %d/%d unique/duplicate transitions\n"
-+msgstr "  %d/%d unieke/kopie-toestanden\n"
-+
-+#: main.c:846
-+#, c-format
-+msgid "  %d table entries\n"
-+msgstr "  %d tabelvelden\n"
-+
-+#: main.c:854
-+#, c-format
-+msgid "  %d/%d base-def entries created\n"
-+msgstr "  %d/%d basis-def-velden aangemaakt\n"
-+
-+#: main.c:858
-+#, c-format
-+msgid "  %d/%d (peak %d) nxt-chk entries created\n"
-+msgstr "  %d/%d (piek %d) nxt-chk-velden aangemaakt\n"
-+
-+#: main.c:862
-+#, c-format
-+msgid "  %d/%d (peak %d) template nxt-chk entries created\n"
-+msgstr "  %d/%d (piek %d) template nxt-chk-velden aangemaakt\n"
-+
-+#: main.c:866
-+#, c-format
-+msgid "  %d empty table entries\n"
-+msgstr "  %d lege tabelvelden\n"
-+
-+#: main.c:868
-+#, c-format
-+msgid "  %d protos created\n"
-+msgstr "  %d proto's aangemaakt\n"
-+
-+#: main.c:871
-+#, c-format
-+msgid "  %d templates created, %d uses\n"
-+msgstr "  %d templates aangemaakt, %d gebruikt\n"
-+
-+#: main.c:879
-+#, c-format
-+msgid "  %d/%d equivalence classes created\n"
-+msgstr "  %d/%d equivalentieklassen aangemaakt\n"
-+
-+#: main.c:887
-+#, c-format
-+msgid "  %d/%d meta-equivalence classes created\n"
-+msgstr "  %d/%d meta-equivalentieklassen aangemaakt\n"
-+
-+#: main.c:893
-+#, c-format
-+msgid "  %d (%d saved) hash collisions, %d DFAs equal\n"
-+msgstr "  %d (%d bewaarde) hash-botsingen, %d DFA's gelijk\n"
-+
-+#: main.c:895
-+#, c-format
-+msgid "  %d sets of reallocations needed\n"
-+msgstr "  %d verzamelingen van reallocaties nodig\n"
-+
-+#: main.c:897
-+#, c-format
-+msgid "  %d total table entries needed\n"
-+msgstr "  %d totale tabelvelden nodig\n"
-+
-+#: main.c:972
-+#, c-format
-+msgid "Internal error. flexopts are malformed.\n"
-+msgstr "Interne fout. flexopts hebben verkeerd formaat.\n"
-+
-+#: main.c:982
-+#, c-format
-+msgid "Try `%s --help' for more information.\n"
-+msgstr "Probeer `%s --help' voor meer informatie.\n"
-+
-+#: main.c:1039
-+#, c-format
-+msgid "unknown -C option '%c'"
-+msgstr "onbekende -C-optie '%c'"
-+
-+#: main.c:1168
-+#, c-format
-+msgid "%s %s\n"
-+msgstr "%s %s\n"
-+
-+#: main.c:1443
-+msgid "fatal parse error"
-+msgstr "fatale parsefout"
-+
-+#: main.c:1475
-+#, c-format
-+msgid "could not create backing-up info file %s"
-+msgstr "kon infobestand %s voor reservekopie niet aanmaken"
-+
-+#: main.c:1496
-+#, c-format
-+msgid "-l AT&T lex compatibility option entails a large performance penalty\n"
-+msgstr ""
-+"-I AT&T lex-compatibiliteitsoptie brengt een groot performantieverlies met "
-+"zich mee\n"
-+
-+#: main.c:1499
-+#, c-format
-+msgid " and may be the actual source of other reported performance penalties\n"
-+msgstr ""
-+" en kan de eigenlijke bron zijn van ander gerapporteerd performantieverlies\n"
-+
-+#: main.c:1505
-+#, c-format
-+msgid ""
-+"%%option yylineno entails a performance penalty ONLY on rules that can match "
-+"newline characters\n"
-+msgstr ""
-+"%%optie yylineno brengt een performantieverlies met zich mee ENKEL op regels "
-+"die kunnen overeenkomen met nl-karakters\n"
-+
-+#: main.c:1512
-+#, c-format
-+msgid "-I (interactive) entails a minor performance penalty\n"
-+msgstr "-I (interactief) brengt een licht performantieverlies met zich mee\n"
-+
-+#: main.c:1517
-+#, c-format
-+msgid "yymore() entails a minor performance penalty\n"
-+msgstr "yymore() brengt een licht performantieverlies met zich mee\n"
-+
-+#: main.c:1523
-+#, c-format
-+msgid "REJECT entails a large performance penalty\n"
-+msgstr "REJECT brengt een groot performantieverlies met zich mee\n"
-+
-+#: main.c:1528
-+#, c-format
-+msgid "Variable trailing context rules entail a large performance penalty\n"
-+msgstr ""
-+"Regels met een variabele eindcontext brengen een groot performantieverlies "
-+"met zich mee\n"
-+
-+#: main.c:1540
-+msgid "REJECT cannot be used with -f or -F"
-+msgstr "REJECT kan niet worden gebruikt met -f of -F"
-+
-+#: main.c:1543
-+#, c-format
-+msgid "%option yylineno cannot be used with REJECT"
-+msgstr "%optie yylineno kan niet worden gebruikt met REJECT"
-+
-+#: main.c:1546
-+msgid "variable trailing context rules cannot be used with -f or -F"
-+msgstr ""
-+"regels met variabele eindcontext kunnen niet gebruikt worden met -f of -F"
-+
-+#: main.c:1661
-+#, c-format
-+msgid "%option yyclass only meaningful for C++ scanners"
-+msgstr "%optie yyclass enkel betekenisvol voor C++-scanners"
-+
-+#: main.c:1768
-+#, c-format
-+msgid "Usage: %s [OPTIONS] [FILE]...\n"
-+msgstr "Gebruik: %s [OPTIES] [BESTAND] ...\n"
-+
-+#: main.c:1771
-+#, c-format
-+msgid ""
-+"Generates programs that perform pattern-matching on text.\n"
-+"\n"
-+"Table Compression:\n"
-+"  -Ca, --align      trade off larger tables for better memory alignment\n"
-+"  -Ce, --ecs        construct equivalence classes\n"
-+"  -Cf               do not compress tables; use -f representation\n"
-+"  -CF               do not compress tables; use -F representation\n"
-+"  -Cm, --meta-ecs   construct meta-equivalence classes\n"
-+"  -Cr, --read       use read() instead of stdio for scanner input\n"
-+"  -f, --full        generate fast, large scanner. Same as -Cfr\n"
-+"  -F, --fast        use alternate table representation. Same as -CFr\n"
-+"  -Cem              default compression (same as --ecs --meta-ecs)\n"
-+"\n"
-+"Debugging:\n"
-+"  -d, --debug             enable debug mode in scanner\n"
-+"  -b, --backup            write backing-up information to %s\n"
-+"  -p, --perf-report       write performance report to stderr\n"
-+"  -s, --nodefault         suppress default rule to ECHO unmatched text\n"
-+"  -T, --trace             %s should run in trace mode\n"
-+"  -w, --nowarn            do not generate warnings\n"
-+"  -v, --verbose           write summary of scanner statistics to stdout\n"
-+"\n"
-+"Files:\n"
-+"  -o, --outfile=FILE      specify output filename\n"
-+"  -S, --skel=FILE         specify skeleton file\n"
-+"  -t, --stdout            write scanner on stdout instead of %s\n"
-+"      --yyclass=NAME      name of C++ class\n"
-+"      --header-file=FILE   create a C header file in addition to the "
-+"scanner\n"
-+"      --tables-file[=FILE] write tables to FILE\n"
-+"\n"
-+"Scanner behavior:\n"
-+"  -7, --7bit              generate 7-bit scanner\n"
-+"  -8, --8bit              generate 8-bit scanner\n"
-+"  -B, --batch             generate batch scanner (opposite of -I)\n"
-+"  -i, --case-insensitive  ignore case in patterns\n"
-+"  -l, --lex-compat        maximal compatibility with original lex\n"
-+"  -X, --posix-compat      maximal compatibility with POSIX lex\n"
-+"  -I, --interactive       generate interactive scanner (opposite of -B)\n"
-+"      --yylineno          track line count in yylineno\n"
-+"\n"
-+"Generated code:\n"
-+"  -+,  --c++               generate C++ scanner class\n"
-+"  -Dmacro[=defn]           #define macro defn  (default defn is '1')\n"
-+"  -L,  --noline            suppress #line directives in scanner\n"
-+"  -P,  --prefix=STRING     use STRING as prefix instead of \"yy\"\n"
-+"  -R,  --reentrant         generate a reentrant C scanner\n"
-+"       --bison-bridge      scanner for bison pure parser.\n"
-+"       --bison-locations   include yylloc support.\n"
-+"       --stdinit           initialize yyin/yyout to stdin/stdout\n"
-+"       --noansi-definitions old-style function definitions\n"
-+"       --noansi-prototypes  empty parameter list in prototypes\n"
-+"       --nounistd          do not include <unistd.h>\n"
-+"       --noFUNCTION        do not generate a particular FUNCTION\n"
-+"\n"
-+"Miscellaneous:\n"
-+"  -c                      do-nothing POSIX option\n"
-+"  -n                      do-nothing POSIX option\n"
-+"  -?\n"
-+"  -h, --help              produce this help message\n"
-+"  -V, --version           report %s version\n"
-+msgstr ""
-+"Maakt programma's die een pattroonherkening uitvoeren op tekst.\n"
-+"\n"
-+"Tabelcompressie:\n"
-+"  -Ca, --align         trade-off grotere tabellen voor betere "
-+"geheugenaliniëring\n"
-+"  -Ce, --ecs          construeer equivalentieklassen\n"
-+"  -Cf                  comprimeer tabellen niet; gebruik -f-voorstelling\n"
-+"  -CF                  comprimeer tabellen niet; gebruik -F-voorstelling\n"
-+"  -Cm, --meta-ecs      construeer meta-equivalentieklassen\n"
-+"  -Cr, --read          gebruik read() inplaats van stdio voor scanner-"
-+"invoer\n"
-+"  -f, --full           genereer snelle, grote scanner. Zelfde als -Cfr\n"
-+"  -F, --fast           gebruik alternerende tabelvoorstelling. Zelfde als -"
-+"CFr\n"
-+"  -Cem                 standaard compressie (zelfde als --ecs --meta-ecs)\n"
-+"\n"
-+"Debugging:\n"
-+"  -d, --debug          schakel debug-modus in scanner in\n"
-+"  -b, --backup         schrijf informatie over reservekopies naar %s\n"
-+"  -p, --perf-report    schrijf performantierapport naar stderr\n"
-+"  -s, --nodefault      onderdruk standaard regel om niet overeenkomende "
-+"tekst te echoën\n"
-+"  -T, --trace          %s zou in trace-modus moeten uitvoeren\n"
-+"  -w, --nowarn         genereer geen waarschuwingen\n"
-+"  -v, --verbose        schrijf samenvatting van scannerstatistieken naar "
-+"stdout\n"
-+"\n"
-+"Bestanden:\n"
-+"  -o, --outfile=BESTAND     specifieer uitvoerbestandsnaam\n"
-+"  -S, --skel=BESTAND        specifieer skeletbestand\n"
-+"  -t, --stdout              schrijf scanner op stdout inplaats van %s\n"
-+"      --yyclass=NAAM        naam van C++-klasse\n"
-+"      --header-file=BESTAND maak een C-headerbestand naast de scanner\n"
-+"      --tables-file[=BESTAND]  schrijf tabellen naar BESTAND\n"
-+"\n"
-+"Scanner-gedrag:\n"
-+"  -7, --7bit           maak een 7-bit scanner\n"
-+"  -8, --8bit           maak een 8-bit scanner\n"
-+"  -B, --batch          maak batch-scanner (tegengestelde van -l)\n"
-+"  -i, --case-insentive negeer hoofdletters in patronen\n"
-+"  -l, --lex-compat     maximale compatibiliteit met originele lex\n"
-+"  -X, --posix-compat   maximale compatibiliteit met POSIX-lex\n"
-+"  -I, --interactive    maak interactieve scanner (tegengestelde van -B)\n"
-+"      --yylineno       traceer regelnummers in yylineno\n"
-+"\n"
-+"Gegenereerde code:\n"
-+"  -+, --c++                maak C++-scannerklasse\n"
-+"  -Dmacro[=defn]           #define macro defn (standaard defn is '1')\n"
-+"  -L, --noline             onderdruk #line-richtlijnen in scanner\n"
-+"  -P, --prefix=STRING      gebruik STRING als prefix inplaats van \"yy\"\n"
-+"  -R, --reentrant          maak een reentrant-scanner\n"
-+"      --bison-bridge       scanner voor bison pure parser.\n"
-+"      --bison-locations     includeer yylloc-ondersteuning.\n"
-+"      --stdinit            initialiseer yyin/yyout naar stdin/stdout\n"
-+"      --noansi-definitions oude stijl functie-definities\n"
-+"      --noansi-prototypes  leeg parameterlijst in prototypes\n"
-+"      --nounistd           includeer geen <unistd.h>\n"
-+"      --noFUNCTIE          genereer geen bepaalde FUNCTIE\n"
-+"\n"
-+"Overige:\n"
-+"  -c                   doe niets POSIX-optie\n"
-+"  -n                   doe niets POSIX-optie\n"
-+"  -?\n"
-+"  -h, --help            produceer deze help-boodschap\n"
-+"  -V, --version        rapporteer %s-versie\n"
-+
-+#: misc.c:100 misc.c:126
-+#, c-format
-+msgid "name \"%s\" ridiculously long"
-+msgstr "naam \"%s\" belachelijk lang"
-+
-+#: misc.c:175
-+msgid "memory allocation failed in allocate_array()"
-+msgstr "geheugenallocatie faalde in allocate_array()"
-+
-+#: misc.c:250
-+#, c-format
-+msgid "bad character '%s' detected in check_char()"
-+msgstr "slecht karakter '%s' gedetecteerd in check_char()"
-+
-+#: misc.c:255
-+#, c-format
-+msgid "scanner requires -8 flag to use the character %s"
-+msgstr "scanner vereist -8 vlag om het karakter %s te gebruiken"
-+
-+#: misc.c:288
-+msgid "dynamic memory failure in copy_string()"
-+msgstr "dynamische geheugenfout in copy_string()"
-+
-+#: misc.c:422
-+#, c-format
-+msgid "%s: fatal internal error, %s\n"
-+msgstr "%s: fatale interne fout, %s\n"
-+
-+#: misc.c:875
-+msgid "attempt to increase array size failed"
-+msgstr "poging om rijgrootte te vergroten faalde"
-+
-+#: misc.c:1002
-+msgid "bad line in skeleton file"
-+msgstr "slechte regel in skeletbestand"
-+
-+#: misc.c:1051
-+msgid "memory allocation failed in yy_flex_xmalloc()"
-+msgstr "geheugenallocatie faalde in yy_flex_xmalloc()"
-+
-+#: nfa.c:104
-+#, c-format
-+msgid ""
-+"\n"
-+"\n"
-+"********** beginning dump of nfa with start state %d\n"
-+msgstr ""
-+"\n"
-+"\n"
-+"********** begin dump van nfa met starttoestand %d\n"
-+
-+#: nfa.c:115
-+#, c-format
-+msgid "state # %4d\t"
-+msgstr "toestand # %4d\t"
-+
-+#: nfa.c:130
-+#, c-format
-+msgid "********** end of dump\n"
-+msgstr "********** einde van dump\n"
-+
-+#: nfa.c:174
-+msgid "empty machine in dupmachine()"
-+msgstr "lege machine in dumpmachine()"
-+
-+#: nfa.c:240
-+#, c-format
-+msgid "Variable trailing context rule at line %d\n"
-+msgstr "Regel met variabele eindcontext op regel %d\n"
-+
-+#: nfa.c:353
-+msgid "bad state type in mark_beginning_as_normal()"
-+msgstr "slecht toestandstype in mark_beginning_as_normal()"
-+
-+#: nfa.c:598
-+#, c-format
-+msgid "input rules are too complicated (>= %d NFA states)"
-+msgstr "invoerregels zijn te complex (>= %d NFA-toestanden)"
-+
-+#: nfa.c:677
-+msgid "found too many transitions in mkxtion()"
-+msgstr "vond te veel transities in mkxtion()"
-+
-+#: nfa.c:703
-+#, c-format
-+msgid "too many rules (> %d)!"
-+msgstr "te veel regels (> %d)!"
-+
-+#: parse.y:183
-+msgid "unknown error processing section 1"
-+msgstr "onbekende fout bij het behandelen van sectie 1"
-+
-+#: parse.y:208 parse.y:373
-+msgid "bad start condition list"
-+msgstr "slechte startvoorwaardenlijst"
-+
-+#: parse.y:337
-+msgid "unrecognized rule"
-+msgstr "onbekende regel"
-+
-+#: parse.y:456 parse.y:469 parse.y:538
-+msgid "trailing context used twice"
-+msgstr "eindcontext twee keer gebruikt"
-+
-+#: parse.y:574 parse.y:584 parse.y:657 parse.y:667
-+msgid "bad iteration values"
-+msgstr "slechte iteratiewaarden"
-+
-+#: parse.y:602 parse.y:620 parse.y:685 parse.y:703
-+msgid "iteration value must be positive"
-+msgstr "iteratiewaarde moet positief zijn"
-+
-+#: parse.y:817 parse.y:827
-+#, c-format
-+msgid "the character range [%c-%c] is ambiguous in a case-insensitive scanner"
-+msgstr ""
-+"het karakterbereik [%c-%c] is ambigu in een niet-hoofdlettergevoelige scanner"
-+
-+#: parse.y:832
-+msgid "negative range in character class"
-+msgstr "negatief bereik in karakterklasse"
-+
-+#: scan.l:70 scan.l:180 scan.l:273 scan.l:415 scan.l:554 scan.l:604
-+msgid "Input line too long\n"
-+msgstr "Invoerregel te lang\n"
-+
-+#: scan.l:149
-+#, c-format
-+msgid "malformed '%top' directive"
-+msgstr "'%top'-richtlijn in slecht formaat"
-+
-+#. ignore
-+#. ignore
-+#: scan.l:171
-+#, no-c-format
-+msgid "unrecognized '%' directive"
-+msgstr "onbekende '%'-richtlijn"
-+
-+#: scan.l:257
-+msgid "Unmatched '{'"
-+msgstr "Niet-gebalanceerde '{'"
-+
-+#: scan.l:290
-+msgid "incomplete name definition"
-+msgstr "onvolledige naamdefinitie"
-+
-+#: scan.l:423
-+#, c-format
-+msgid "unrecognized %%option: %s"
-+msgstr "onbekende %%optie: %s"
-+
-+#: scan.l:564 scan.l:683
-+msgid "bad character class"
-+msgstr "slechte karakterklasse"
-+
-+#: scan.l:611
-+#, c-format
-+msgid "undefined definition {%s}"
-+msgstr "ongedefinieerde definitie {%s}"
-+
-+#: scan.l:651
-+#, c-format
-+msgid "bad <start condition>: %s"
-+msgstr "slechte <startvoorwaarde>: %s"
-+
-+#: scan.l:664
-+msgid "missing quote"
-+msgstr "ontbrekend aanhalingsteken"
-+
-+#: scan.l:704
-+#, c-format
-+msgid "bad character class expression: %s"
-+msgstr "slechte karakterklasse-expressie: %s"
-+
-+#: scan.l:726
-+msgid "bad character inside {}'s"
-+msgstr "slecht karakter in {}'en"
-+
-+#: scan.l:732
-+msgid "missing }"
-+msgstr "ontbrekend }"
-+
-+#: scan.l:805
-+msgid "EOF encountered inside an action"
-+msgstr "EOF tegengekomen in een actie"
-+
-+#: scan.l:825
-+#, c-format
-+msgid "bad character: %s"
-+msgstr "slecht karakter: %s"
-+
-+#: scan.l:854
-+#, c-format
-+msgid "can't open %s"
-+msgstr "kan %s niet openen"
-+
-+#: scanopt.c:291
-+#, c-format
-+msgid "Usage: %s [OPTIONS]...\n"
-+msgstr "Gebruik: %s [OPTIES] ...\n"
-+
-+#: scanopt.c:565
-+#, c-format
-+msgid "option `%s' doesn't allow an argument\n"
-+msgstr "optie `%s' heeft geen argumenten\n"
-+
-+#: scanopt.c:570
-+#, c-format
-+msgid "option `%s' requires an argument\n"
-+msgstr "optie `%s' heeft een argument\n"
-+
-+#: scanopt.c:574
-+#, c-format
-+msgid "option `%s' is ambiguous\n"
-+msgstr "optie `%s' is ambigu\n"
-+
-+#: scanopt.c:578
-+#, c-format
-+msgid "Unrecognized option `%s'\n"
-+msgstr "Onbekende optie `%s'\n"
-+
-+#: scanopt.c:582
-+#, c-format
-+msgid "Unknown error=(%d)\n"
-+msgstr "Onbekende fout=(%d)\n"
-+
-+#: sym.c:100
-+msgid "symbol table memory allocation failed"
-+msgstr "geheugenallocatie voor symbooltabel faalde"
-+
-+#: sym.c:203
-+msgid "name defined twice"
-+msgstr "naam twee keer gedefinieerd"
-+
-+#: sym.c:254
-+#, c-format
-+msgid "start condition %s declared twice"
-+msgstr "startvoorwaarde %s twee keer opgegeven"
-+
-+#: yylex.c:56
-+msgid "premature EOF"
-+msgstr "premature EOF"
-+
-+#: yylex.c:198
-+#, c-format
-+msgid "End Marker\n"
-+msgstr "Einde-markering\n"
-+
-+#: yylex.c:204
-+#, c-format
-+msgid "*Something Weird* - tok: %d val: %d\n"
-+msgstr "*Iets vreemd* - tok: %d val: %d\n"
-diff -Naur flex-2.5.31.orig/scan.c flex-2.5.31/scan.c
---- flex-2.5.31.orig/scan.c	2003-04-01 16:33:17.000000000 +0000
-+++ flex-2.5.31/scan.c	2005-01-08 07:43:02.020873896 +0000
-@@ -1,4 +1,4 @@
--
-+ 
- #line 3 "scan.c"
- 
- #define  YY_INT_ALIGNED short int
-@@ -351,8 +351,8 @@
- 	*yy_cp = '\0'; \
- 	(yy_c_buf_p) = yy_cp;
- 
--#define YY_NUM_RULES 201
--#define YY_END_OF_BUFFER 202
-+#define YY_NUM_RULES 204
-+#define YY_END_OF_BUFFER 205
- /* This struct is not used in this scanner,
-    but its presence is necessary. */
- struct yy_trans_info
-@@ -360,115 +360,115 @@
- 	flex_int32_t yy_verify;
- 	flex_int32_t yy_nxt;
- 	};
--static yyconst flex_int16_t yy_accept[973] =
-+static yyconst flex_int16_t yy_accept[977] =
-     {   0,
--        0,    0,    0,    0,  122,  122,  199,  199,    0,    0,
--        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-+        0,    0,    0,    0,  125,  125,  202,  202,    0,    0,
-         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
--      202,  200,    9,   20,  200,   18,    1,   19,  200,  200,
--      200,  200,   17,  143,  135,  136,  143,  128,  143,  142,
--      143,  143,  143,  142,  134,  124,  143,  143,  126,  127,
--      122,  123,  122,  121,  120,  121,  199,  199,   30,   31,
--       30,   30,   30,   30,   30,   30,   37,   36,   38,  200,
--      149,  149,  144,  149,  145,  146,  148,  150,  177,  178,
--
--      177,  175,  174,  176,  151,  153,  151,  152,  151,  156,
--      156,  156,  156,  158,  160,  158,  158,  158,  158,  159,
--      187,  191,  187,  190,  192,  192,  188,  188,  188,  185,
--      186,  200,  117,  200,   23,   24,   23,   22,  193,  195,
--      193,  196,  197,  183,  183,  184,  183,  183,  183,  183,
--      183,  183,  183,  116,   40,   39,  116,  116,  116,  116,
--       41,  116,  116,  116,  116,  116,  116,  116,  116,  116,
--      116,  116,  116,  116,  116,  116,  116,  116,  116,  116,
--      116,  116,   28,   25,   28,   26,   35,   34,  200,   33,
--       32,    9,   20,    0,   18,    1,   19,    0,    0,    0,
--
--       16,   10,    0,    0,    0,    0,    4,   16,    5,    0,
--        2,   17,  135,  136,    0,    0,    0,  130,    0,    0,
--      140,  140,    0,  198,  198,  198,  129,    0,  134,  124,
--        0,    0,    0,  126,  127,  139,  125,    0,  122,  123,
--      121,  120,  120,  118,  119,  199,  199,   30,   31,   30,
--       30,   30,   30,   37,   36,   38,    0,  144,    0,  144,
--      147,  148,  178,  174,  153,    0,  154,  155,  160,  157,
--      187,  191,    0,  189,    0,  180,  188,  188,  188,    0,
--      117,    0,   23,   24,   23,   21,  193,  195,  194,  183,
--      183,  183,  184,  179,  183,  183,  183,   40,   39,    0,
--
--      115,    0,    0,  116,  116,  116,  116,  116,  116,  116,
--      116,  116,  116,  116,  116,  116,  116,  116,  116,  116,
--      116,  116,   42,  116,  116,  116,  116,  116,  116,  116,
--      116,  116,  116,  116,    0,   27,   26,   35,   34,    0,
--       16,   10,    0,   14,    0,    0,    0,    0,    0,    4,
--       16,    5,    0,    6,    0,  131,    0,  132,    0,    0,
--      140,  140,    0,  140,  140,  140,  198,  198,    0,  141,
--      125,  133,    0,  139,    0,  118,  119,   30,   30,   30,
--       29,   30,    0,    0,    0,    0,    0,    0,    0,    0,
--        0,    0,    0,    0,  188,  188,  179,  179,  183,  183,
--
--        0,    0,  116,  116,  116,  116,  116,  116,  116,   54,
--      116,  116,  116,   59,  116,  116,  116,  116,  116,  116,
--      116,  116,  116,  116,  116,  116,  116,  116,  116,  116,
--      116,  116,  116,  116,  116,  116,  116,  116,    0,  116,
--      116,  116,  116,  116,  116,  116,  116,  116,    0,    0,
--        0,   14,    0,    0,    0,    0,    0,    0,    4,    8,
--        5,    0,  140,  140,  140,  140,  140,  140,  198,  141,
--        0,    0,   30,   30,    0,    0,    0,    0,    0,    0,
--        0,    0,    0,    0,    0,    0,    0,  188,  188,  183,
--      183,   43,   44,  116,  116,  116,  116,  116,  116,  116,
--
--      116,  116,  116,   60,   61,  116,  116,  116,  116,   66,
--      116,  116,  116,  116,  116,  116,  116,   71,  116,  116,
--      116,  116,  116,  116,  116,  116,  116,   80,    0,    0,
--        0,  116,  116,  116,  116,  116,  116,  116,  116,  116,
--        0,   15,    0,    0,    0,    0,    0,    8,    8,    8,
--        0,  140,  140,  140,  140,  140,  140,    0,    0,   30,
--       30,  173,    0,    0,    0,    0,    0,    0,    0,    0,
--        0,    0,    0,    0,  188,  188,  183,  183,   45,  116,
--      116,   47,  116,   51,  116,  116,  116,  116,   57,  116,
--      116,   62,  116,  116,  116,  116,  116,  116,  116,  116,
--
--      116,  116,  116,   74,  116,  116,  116,  116,   78,  116,
--        0,    0,    0,    0,  116,  116,  116,  116,  116,  116,
--      116,  116,  116,    3,    0,    0,    0,    8,    7,    8,
--        0,  140,  140,  140,    0,    0,   30,   30,    0,    0,
-         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
--      181,  182,  181,  182,  116,  116,  116,   50,  116,  116,
--      116,  116,  116,  116,  112,  116,  116,  116,  116,  116,
--      116,  116,  116,  110,  116,   73,  116,   76,  116,   77,
--      116,    0,    0,    0,    0,  116,  116,   92,    0,  116,
--       82,  116,    0,   83,    0,   12,    0,   13,    0,  138,
--
--        0,  137,    0,    0,    0,    0,    0,    0,    0,    0,
--        0,    0,    0,    0,  116,  116,  116,  116,  116,  116,
--      116,   55,  116,   58,  116,  116,  116,  116,  116,  109,
--      116,   70,  116,  116,   75,  116,   79,    0,    0,    0,
--        0,   90,  111,    0,    0,    0,    0,    0,    0,  116,
--      116,    0,    0,    0,    0,    0,    0,  137,    0,    0,
-+      205,  203,    9,   20,  203,   18,    1,   19,  203,  203,
-+      203,  203,   17,  146,  138,  139,  146,  131,  146,  145,
-+      146,  146,  146,  145,  137,  127,  146,  146,  129,  130,
-+      125,  126,  125,  124,  123,  124,  202,  202,   33,   34,
-+       33,   33,   33,   33,   33,   33,   40,   39,   41,  203,
-+      152,  152,  147,  152,  148,  149,  151,  153,  180,  181,
-+
-+      180,  178,  177,  179,  154,  156,  154,  155,  154,  159,
-+      159,  159,  159,  161,  163,  161,  161,  161,  161,  162,
-+      190,  194,  190,  193,  195,  195,  191,  191,  191,  188,
-+      189,  203,  120,  203,   24,   25,   24,   22,   23,   23,
-+      196,  198,  196,  199,  200,  186,  186,  187,  186,  186,
-+      186,  186,  186,  186,  186,  119,   43,   42,  119,  119,
-+      119,  119,   44,  119,  119,  119,  119,  119,  119,  119,
-+      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-+      119,  119,  119,  119,   31,   28,   31,   29,   38,   37,
-+      203,   36,   35,    9,   20,    0,   18,    1,   19,    0,
-+
-+        0,    0,   16,   10,    0,    0,    0,    0,    4,   16,
-+        5,    0,    2,   17,  138,  139,    0,    0,    0,  133,
-+        0,    0,  143,  143,    0,  201,  201,  201,  132,    0,
-+      137,  127,    0,    0,    0,  129,  130,  142,  128,    0,
-+      125,  126,  124,  123,  123,  121,  122,  202,  202,   33,
-+       34,   33,   33,   33,   33,   40,   39,   41,    0,  147,
-+        0,  147,  150,  151,  181,  177,  156,    0,  157,  158,
-+      163,  160,  190,  194,    0,  192,    0,  183,  191,  191,
-+      191,    0,  120,    0,   24,   25,   24,   21,   26,   27,
-+      196,  198,  197,  186,  186,  186,  187,  182,  186,  186,
-+
-+      186,   43,   42,    0,  118,    0,    0,  119,  119,  119,
-+      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-+      119,  119,  119,  119,  119,  119,   45,  119,  119,  119,
-+      119,  119,  119,  119,  119,  119,  119,  119,    0,   30,
-+       29,   38,   37,    0,   16,   10,    0,   14,    0,    0,
-+        0,    0,    0,    4,   16,    5,    0,    6,    0,  134,
-+        0,  135,    0,    0,  143,  143,    0,  143,  143,  143,
-+      201,  201,    0,  144,  128,  136,    0,  142,    0,  121,
-+      122,   33,   33,   33,   32,   33,    0,    0,    0,    0,
-+        0,    0,    0,    0,    0,    0,    0,    0,  191,  191,
-+
-+      182,  182,  186,  186,    0,    0,  119,  119,  119,  119,
-+      119,  119,  119,   57,  119,  119,  119,   62,  119,  119,
-+      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-+      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-+      119,  119,    0,  119,  119,  119,  119,  119,  119,  119,
-+      119,  119,    0,    0,    0,   14,    0,    0,    0,    0,
-+        0,    0,    4,    8,    5,    0,  143,  143,  143,  143,
-+      143,  143,  201,  144,    0,    0,   33,   33,    0,    0,
-         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
--      116,  116,  116,  116,  116,  116,  116,   56,  116,  116,
--      116,   67,  116,  116,  116,  116,  116,  116,    0,    0,
--        0,    0,    0,    0,  101,    0,    0,    0,    0,    0,
--
--        0,   81,  116,    0,    0,  102,    0,    0,    0,    0,
--        0,   11,    0,  161,  162,  163,  164,  165,  166,  167,
--      168,  169,  170,  171,    0,  116,  116,  116,  116,  116,
--      116,  116,  116,  116,  116,  116,  116,  116,   72,  116,
--      116,    0,    0,    0,    0,    0,    0,    0,    0,    0,
--        0,    0,  103,    0,   91,    0,    0,    0,    0,    0,
--      104,  172,  116,  116,  116,  116,  116,  116,  116,  116,
--      116,   64,  116,  116,  116,  116,  116,    0,    0,    0,
--        0,    0,    0,    0,    0,   97,    0,  107,  105,   98,
--        0,    0,    0,  108,  106,  116,  116,  116,  116,  116,
--
--      116,  116,  112,   63,  116,   69,  116,  113,  116,    0,
--        0,    0,    0,    0,    0,   93,   95,    0,   94,   96,
--        0,  116,  116,  116,   52,  116,  116,  116,  116,   65,
--      116,   85,    0,    0,    0,    0,   86,   99,  100,  116,
--      116,  116,  116,  116,  116,  116,  114,   84,    0,   88,
--        0,  116,  116,  116,  116,  116,  116,   87,   89,  116,
--      116,   49,   53,  116,  116,  116,   48,  116,  116,   68,
--       46,    0
-+        0,  191,  191,  186,  186,   46,   47,  119,  119,  119,
-+
-+      119,  119,  119,  119,  119,  119,  119,   63,   64,  119,
-+      119,  119,  119,   69,  119,  119,  119,  119,  119,  119,
-+      119,   74,  119,  119,  119,  119,  119,  119,  119,  119,
-+      119,   83,    0,    0,    0,  119,  119,  119,  119,  119,
-+      119,  119,  119,  119,    0,   15,    0,    0,    0,    0,
-+        0,    8,    8,    8,    0,  143,  143,  143,  143,  143,
-+      143,    0,    0,   33,   33,  176,    0,    0,    0,    0,
-+        0,    0,    0,    0,    0,    0,    0,    0,  191,  191,
-+      186,  186,   48,  119,  119,   50,  119,   54,  119,  119,
-+      119,  119,   60,  119,  119,   65,  119,  119,  119,  119,
-+
-+      119,  119,  119,  119,  119,  119,  119,   77,  119,  119,
-+      119,  119,   81,  119,    0,    0,    0,    0,  119,  119,
-+      119,  119,  119,  119,  119,  119,  119,    3,    0,    0,
-+        0,    8,    7,    8,    0,  143,  143,  143,    0,    0,
-+       33,   33,    0,    0,    0,    0,    0,    0,    0,    0,
-+        0,    0,    0,    0,  184,  185,  184,  185,  119,  119,
-+      119,   53,  119,  119,  119,  119,  119,  119,  115,  119,
-+      119,  119,  119,  119,  119,  119,  119,  113,  119,   76,
-+      119,   79,  119,   80,  119,    0,    0,    0,    0,  119,
-+      119,   95,    0,  119,   85,  119,    0,   86,    0,   12,
-+
-+        0,   13,    0,  141,    0,  140,    0,    0,    0,    0,
-+        0,    0,    0,    0,    0,    0,    0,    0,  119,  119,
-+      119,  119,  119,  119,  119,   58,  119,   61,  119,  119,
-+      119,  119,  119,  112,  119,   73,  119,  119,   78,  119,
-+       82,    0,    0,    0,    0,   93,  114,    0,    0,    0,
-+        0,    0,    0,  119,  119,    0,    0,    0,    0,    0,
-+        0,  140,    0,    0,    0,    0,    0,    0,    0,    0,
-+        0,    0,    0,    0,  119,  119,  119,  119,  119,  119,
-+      119,   59,  119,  119,  119,   70,  119,  119,  119,  119,
-+      119,  119,    0,    0,    0,    0,    0,    0,  104,    0,
-+
-+        0,    0,    0,    0,    0,   84,  119,    0,    0,  105,
-+        0,    0,    0,    0,    0,   11,    0,  164,  165,  166,
-+      167,  168,  169,  170,  171,  172,  173,  174,    0,  119,
-+      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-+      119,  119,   75,  119,  119,    0,    0,    0,    0,    0,
-+        0,    0,    0,    0,    0,    0,  106,    0,   94,    0,
-+        0,    0,    0,    0,  107,  175,  119,  119,  119,  119,
-+      119,  119,  119,  119,  119,   67,  119,  119,  119,  119,
-+      119,    0,    0,    0,    0,    0,    0,    0,    0,  100,
-+        0,  110,  108,  101,    0,    0,    0,  111,  109,  119,
-+
-+      119,  119,  119,  119,  119,  119,  115,   66,  119,   72,
-+      119,  116,  119,    0,    0,    0,    0,    0,    0,   96,
-+       98,    0,   97,   99,    0,  119,  119,  119,   55,  119,
-+      119,  119,  119,   68,  119,   88,    0,    0,    0,    0,
-+       89,  102,  103,  119,  119,  119,  119,  119,  119,  119,
-+      117,   87,    0,   91,    0,  119,  119,  119,  119,  119,
-+      119,   90,   92,  119,  119,   52,   56,  119,  119,  119,
-+       51,  119,  119,   71,   49,    0
-     } ;
- 
- static yyconst flex_int32_t yy_ec[256] =
-@@ -507,255 +507,257 @@
-     {   0,
-         1,    1,    2,    1,    3,    4,    1,    1,    1,    5,
-         1,    6,    7,    1,    8,    5,    9,    9,    9,    9,
--        1,    1,    1,    1,   10,   11,    1,   12,   13,    1,
--       14,   15,   15,   15,   15,   15,   15,   16,   16,   16,
--       16,   16,   16,   16,   16,   16,   16,   16,   16,   16,
--       16,   16,   16,   16,   16,   16,   17,    1,   18
-+        1,    1,    1,    1,   10,   11,   12,   13,   14,    1,
-+       15,   16,   16,   16,   16,   16,   16,   17,   17,   17,
-+       17,   17,   17,   17,   17,   17,   17,   17,   17,   17,
-+       17,   17,   17,   17,   17,   17,   18,    1,   19
-     } ;
- 
--static yyconst flex_int16_t yy_base[1070] =
-+static yyconst flex_int16_t yy_base[1074] =
-     {   0,
--        0,   59,  117,  175,  121,  129, 3236, 3235,  234, 3228,
--      138,  144,  293,    0, 3206, 3205,  145,  152,  187,  193,
--      124,  179,  350,  353,  382,    0,  132,  153,  205,  211,
--      439,  443,  471,    0,  530,    0,  354,  444,  587,  588,
--     3234, 3240,  217, 3240, 3230,    0,  222, 3240, 3229,  151,
--      639, 3219,    0, 3240,  592, 3240, 3227, 3240,  226, 3240,
--     3207,  133,  581,  344,  600, 3240, 3225,  595, 3205, 3240,
--        0, 3240, 3223,    0, 3223,  310, 3221, 3240,    0, 3240,
--     3220, 3240,    0, 3186, 3165, 3161,    0, 3217, 3240, 3215,
--     3240,  449, 3215, 3213, 3240, 3185,    0, 3240, 3240, 3240,
--
--     3211, 3240,  438, 3240, 3240, 3240, 3210, 3240,  594, 3240,
--     3191,  596,  197, 3240, 3240, 3208,    0, 3189,  600, 3240,
--        0, 3240, 3206, 3240,  157, 3196,    0, 3171, 3150, 3240,
--     3240,  463, 3240,  603,  616, 3240,  620, 3189,    0, 3240,
--     3201, 3240,    0,    0,  357, 3240, 3200, 3143, 3240, 3189,
--        0, 3164, 3143, 3240, 3196, 3240, 3194, 3190, 3162, 3161,
--     3240,  583,  575,  597, 3157, 3158,  568,    0, 3155, 3145,
--     3153,  433,  143, 3136,  588, 3151, 3135, 3153, 3139, 3147,
--     3150, 3125, 3240, 3240, 3174,  621,    0, 3240, 3176, 3240,
--     3240,  651, 3240, 3175,    0,  657, 3240, 3174,  625, 3136,
--
--        0,    0,  690,  695,  699,  718,    0, 3129,    0,  628,
--     3240,    0,  667, 3240, 3171, 3116,  658, 3240, 3169, 3135,
--      173,  432,  625, 3240,  358,    0, 3240, 3111,  725, 3240,
--     3166, 3111, 3155, 3144, 3240,    0, 3240, 3129,    0, 3240,
--        0,    0, 3162,    0,    0, 3160, 3240,    0, 3240,    0,
--     3121, 3117,  783,    0, 3158, 3240,  662, 3157, 3155, 3155,
--     3240,    0, 3240,  725, 3240,  811, 3240, 3240, 3240, 3240,
--        0, 3240,  185, 3240,    0, 3240,    0, 3115, 3111,  674,
--     3240,  700,  719, 3240,  726, 3240,    0, 3240, 3240,    0,
--      697, 3095, 3240,  866,    0, 3112, 3108, 3149, 3240, 3144,
--
--     3240, 3109, 3108,    0,  686, 3097, 3097,  623, 3095, 3131,
--     3093,  645, 3092, 3091, 3097, 3107,  636, 3083, 3097, 3085,
--        0, 3082, 3240, 3083, 3084,  708, 3096,  718,  717, 3098,
--      713, 3081, 3080,  895, 3122, 3240,  748,    0, 3240, 3082,
--        0,    0,  938, 3240, 3123,  945, 3076, 3073, 3083,    0,
--     3075,    0,  758, 3240,  766, 3240,  767, 3240,  770, 3075,
--      705,  753,  913,  968, 1011, 1023,  739,    0, 3061,  774,
--     3240, 3240, 3083,    0, 3072,    0,    0, 3081, 3070, 1060,
--     3240,    0, 1119, 3094,  826,  916,  907,  913, 1101,  645,
--     1110,  121,  914,  827, 3078, 3067,    0, 1178, 3076, 3065,
--
--     3059, 3058, 3070, 3075, 3066, 3073, 3062, 3069, 3056,    0,
--     3065, 3048, 3067,    0, 3047, 3054, 3061, 3043, 3058, 3078,
--     3047, 3059, 3054, 3052, 3051, 3042, 3046, 3048, 3049, 3038,
--     3046, 3047,  810, 3037, 3029, 3026, 3044, 3031,  983, 3032,
--     3031, 3024, 3036, 3031, 3024, 3033, 3032, 3018, 3030,  848,
--     1149, 3240,  852, 1153, 1042, 3033, 3024, 3018,    0,  995,
--        0, 3025, 1213, 1147, 1253, 3040, 1186, 1274, 3240, 3240,
--     3014, 3022, 3024, 3008,    0, 3027, 1195,  730,  915,  933,
--     1014, 1136, 1123, 1188, 1189, 1194, 1190, 3021, 3005, 3019,
--     3003, 3240, 3240, 3006, 2994, 3034, 2992, 2995, 3007, 3000,
--
--     1259, 3006, 2991,    0,    0, 3006, 2990, 2991, 3005,    0,
--     3023, 2988, 2996, 3020, 2983, 2978, 2992,    0, 2980, 2996,
--     2987, 2983, 2975, 2990, 2974, 2973, 2977,    0,  813, 2988,
--     2975, 2977, 2987, 2982, 2966, 2971, 2966, 2982, 2962, 2980,
--     3009, 3240, 1214, 1220, 2954, 2963, 2957,    0, 1218, 1224,
--     2983, 2985, 1286, 1298, 1252, 1004, 1009, 2968, 2980, 2952,
--     2966, 3240, 1160, 1256, 1255, 1263, 1203, 1197,  100, 1276,
--     1303, 1304, 1124, 1284, 2950, 2964, 2948, 2962,    0, 2947,
--      183,    0, 2949,    0, 2980, 1279, 2942, 2957,    0, 2949,
--     2942,    0, 2958, 2943, 2952, 2972, 2943, 2936, 2948, 2968,
--
--     2927, 2932, 2929,    0, 2939, 2927, 2927, 2941,    0, 2925,
--     2927, 2923, 2940, 2924, 2924, 2919, 2932, 2936, 2930, 2929,
--     2921, 2932, 2915, 2959, 1229, 2915, 2923, 1337, 3240, 2955,
--     2933, 1299, 1026, 1255, 2932, 2931,    0,    0, 1299, 1315,
--      925, 1320, 1323, 1325, 1324, 1327, 1328, 1329, 1331, 1330,
--        0,    0,    0,    0, 2939, 2917, 2903,    0, 1323, 2906,
--     2914, 2906, 2898, 2896, 2931, 2911, 2900, 2909, 2902, 2905,
--     2904, 2890, 2904,    0, 2905,    0, 2885,    0, 2920,    0,
--     2898, 2902, 2893, 2886, 2899, 2895, 2878,    0, 1341, 2882,
--        0, 2883, 1350,    0, 1350, 3240, 1354, 3240, 2876, 3240,
--
--     2900, 3240, 2902, 2901, 2900, 2899, 2898, 2897, 2896, 2895,
--     2894, 2893, 2892, 1337, 2872, 2874, 2864, 2860, 2862, 2857,
--     2861,    0, 2855,    0, 2867, 2852, 2855, 2851, 2803,    0,
--     2796,    0, 2796, 2776,    0,  317,    0, 2753, 2754, 2751,
--     2728,    0,    0, 2741, 2716, 2725, 1355, 2717, 2732, 2714,
--     2703, 2672, 2652, 2654, 1329, 2646, 1357, 3240, 2630, 2612,
--     2597, 2596, 2578, 2574, 2573, 2572, 2569, 2550, 2545, 2552,
--     2521, 2525, 2513, 2521, 2526, 2520, 2502,    0, 2504, 2496,
--     2502,    0, 2469, 2447, 2448, 2420, 2427, 2430, 2410, 2410,
--     1321, 2407, 2421, 2402, 3240, 2407, 2401, 2399, 2393, 2373,
--
--     2364,    0, 2384, 2378, 2359, 3240, 2364, 2360, 2373, 2350,
--     1394, 3240, 1397, 3240, 3240, 3240, 3240, 3240, 3240, 3240,
--     3240, 3240, 3240, 3240, 2368, 2310, 2298, 2279, 2272, 2257,
--     2226, 2228, 2221, 2210, 2206, 2220, 2206, 2207,    0, 2192,
--     2179, 2185, 2143,  808, 2142, 2135, 2114, 2111, 2121, 2104,
--     2088, 2064, 3240, 2055,    0, 2036, 2035, 2047, 2048, 2036,
--     3240, 3240, 2024, 2015, 2003, 2009, 1995, 1995, 1991, 2005,
--     2001,    0, 1984, 1964, 1975, 1963, 1957, 1932, 1924, 1918,
--     1883, 1881, 1878, 1886, 1891, 3240, 1876, 3240, 3240, 3240,
--     1876, 1871, 1840, 3240, 3240, 1831, 1828, 1803, 1822, 1813,
--
--     1812, 1805,    0,    0, 1812,    0, 1792,    0, 1803, 1803,
--     1784, 1794, 1759, 1737, 1723, 3240, 3240, 1708, 3240, 3240,
--     1707, 1701, 1675, 1663,    0, 1663, 1633, 1630, 1373,    0,
--     1350, 3240, 1369, 1368, 1353, 1356, 3240, 3240, 3240, 1360,
--     1343, 1347, 1330, 1321, 1265, 1247,    0, 3240,  124, 3240,
--      405,  419,  551,  585,  661,  729,  812, 3240, 3240,  911,
--      910,    0,    0, 1013, 1100, 1108,    0, 1192, 1195,    0,
--        0, 3240, 1408, 1426, 1444, 1462, 1480, 1498, 1516, 1534,
--     1552, 1570, 1588, 1606, 1624, 1642, 1660, 1671, 1687, 1697,
--     1713, 1731, 1741, 1757, 1775, 1793, 1811, 1829, 1840, 1856,
--
--     1867, 1883, 1901, 1919, 1932, 1943, 1959, 1977, 1995, 2013,
--     2031, 2042, 2058, 2070, 1352, 2086, 2104, 2120, 2138, 2147,
--     2154, 2170, 2181, 2197, 2215, 2233, 2243, 2251, 2269, 2287,
--     2305, 2323, 2341, 2359, 2377, 2395, 2406, 2422, 2433, 2440,
--     2456, 2469, 2480, 2496, 2514, 2532, 2550, 2561, 2577, 2589,
--     2605, 2623, 2639, 2657, 2675, 2686, 2695, 2711, 2729, 2747,
--     2757, 2765, 2783, 2801, 2819, 2830, 2846, 2864, 2882
-+        0,   59,  117,  175,  121,  129, 3310, 3309,  234, 3302,
-+      138,  144,  293,    0, 3280, 3279,  145,  152,  187,  193,
-+      124,  179,  350,  353,  382,    0,  132,  153,  439,  440,
-+      443,  450,  478,    0,  537,    0,  207,  211,  594,  595,
-+     3308, 3314,  217, 3314, 3304,    0,  357, 3314, 3303,  151,
-+      646, 3293,    0, 3314,  599, 3314, 3301, 3314,  361, 3314,
-+     3281,  133,  588,  352,  607, 3314, 3299,  159, 3279, 3314,
-+        0, 3314, 3297,    0, 3297,  316, 3295, 3314,    0, 3314,
-+     3294, 3314,    0, 3260, 3239, 3235,    0, 3291, 3314, 3289,
-+     3314,  455, 3289, 3287, 3314, 3259,    0, 3314, 3314, 3314,
-+
-+     3285, 3314,  444, 3314, 3314, 3314, 3284, 3314,  601, 3314,
-+     3265,  603,  444, 3314, 3314, 3282,    0, 3263,  607, 3314,
-+        0, 3314, 3280, 3314,  157, 3270,    0, 3245, 3224, 3314,
-+     3314,  371, 3314,  467,  471, 3314,  472, 3263, 3251, 3248,
-+        0, 3314, 3273, 3314,    0,    0,  199, 3314, 3272, 3215,
-+     3314, 3261,    0, 3236, 3215, 3314, 3268, 3314, 3266, 3262,
-+     3234, 3233, 3314,  568,  575,  590, 3229, 3230,  582,    0,
-+     3227, 3217, 3225,  325,  143, 3208,  590, 3223, 3207, 3225,
-+     3211, 3219, 3222, 3197, 3314, 3314, 3246,  613,    0, 3314,
-+     3248, 3314, 3314,  639, 3314, 3247,    0,  643, 3314, 3246,
-+
-+      625, 3208,    0,    0,  667,  702,  706,  710,    0, 3201,
-+        0,  635, 3314,    0,  674, 3314, 3243, 3188,  644, 3314,
-+     3241, 3207,  632,  646,  681, 3314,  646,    0, 3314, 3183,
-+      732, 3314, 3238, 3183, 3227, 3216, 3314,    0, 3314, 3201,
-+        0, 3314,    0,    0, 3234,    0,    0, 3232, 3314,    0,
-+     3314,    0, 3193, 3189,  790,    0, 3230, 3314,  737, 3229,
-+     3227, 3227, 3314,    0, 3314,  726, 3314,  818, 3314, 3314,
-+     3314, 3314,    0, 3314,  190, 3314,    0, 3314,    0, 3187,
-+     3183,  697, 3314,  728,  744, 3314,  747, 3314, 3314, 3314,
-+        0, 3314, 3314,    0,  445, 3167, 3314,  873,    0, 3184,
-+
-+     3180, 3221, 3314, 3216, 3314, 3181, 3180,    0,  621, 3169,
-+     3169,  161, 3167, 3203, 3165,  657, 3164, 3163, 3169, 3179,
-+      659, 3155, 3169, 3157,    0, 3154, 3314, 3155, 3156,  631,
-+     3168,  719,  682, 3170,  588, 3153, 3152,  902, 3194, 3314,
-+      746,    0, 3314, 3154,    0,    0,  756, 3314, 3195,  765,
-+     3148, 3145, 3155,    0, 3147,    0,  766, 3314,  774, 3314,
-+      775, 3314,  783, 3147,  827,  836,  920,  975,  926, 1018,
-+      841,    0, 3133,  955, 3314, 3314, 3155,    0, 3144,    0,
-+        0, 3153, 3142, 1055, 3314,    0, 1114, 3166,  920,  921,
-+      736,  926,  929,  927, 1096,  914, 1105,  841, 3150, 3139,
-+
-+        0, 1173, 3148, 3137, 3131, 3130, 3142, 3147, 3138, 3145,
-+     3134, 3141, 3128,    0, 3137, 3120, 3139,    0, 3119, 3126,
-+     3133, 3115, 3130, 3150, 3119, 3131, 3126, 3124, 3123, 3114,
-+     3118, 3120, 3121, 3110, 3118, 3119,   96, 3109, 3101, 3098,
-+     3116, 3103,  918, 3104, 3103, 3096, 3108, 3103, 3096, 3105,
-+     3104, 3090, 3102,  784, 1144, 3314,  864, 1148,  969, 3105,
-+     3096, 3090,    0, 1152,    0, 3097, 1208, 1142, 1248, 3112,
-+     1187, 1269, 3314, 3314, 3086, 3094, 3096, 3080,    0, 3099,
-+     1177,  839, 1134, 1118, 1178, 1185, 1136, 1190, 1186, 1191,
-+     1187, 3093, 3077, 3091, 3075, 3314, 3314, 3078, 3066, 3106,
-+
-+     3064, 3067, 3079, 3072, 1254, 3078, 3063,    0,    0, 3078,
-+     3062, 3063, 3077,    0, 3095, 3060, 3068, 3092, 3055, 3050,
-+     3064,    0, 3052, 3068, 3059, 3055, 3047, 3062, 3046, 3045,
-+     3049,    0,  820, 3060, 3047, 3049, 3059, 3054, 3038, 3043,
-+     3038, 3054, 3034, 3052, 3081, 3314, 1036, 1214, 3026, 3035,
-+     3029,    0, 1156, 1218, 3055, 3057, 1281, 1293, 1020, 1198,
-+     1201, 3040, 3052, 3024, 3038, 3314, 1255, 1251, 1250, 1271,
-+     1253, 1249,  429, 1279,  333, 1298,  934, 1293, 3022, 3036,
-+     3020, 3034,    0, 3019, 1286,    0, 3021,    0, 3052, 1294,
-+     3014, 3029,    0, 3021, 3014,    0, 3030, 3015, 3024, 3044,
-+
-+     3015, 3008, 3020, 3040, 2999, 3004, 3001,    0, 3011, 2999,
-+     2999, 3013,    0, 2997, 2999, 2995, 3012, 2996, 2996, 2991,
-+     3004, 3008, 3002, 3001, 2993, 3004, 2987, 3031, 1037, 2987,
-+     2995, 1333, 3314, 3027, 3005, 1250, 1209, 1288, 3004, 3003,
-+        0,    0,  645, 1316, 1301, 1296, 1302, 1319, 1320, 1321,
-+     1324, 1325, 1328, 1326,    0,    0,    0,    0, 3011, 2989,
-+     2975,    0, 1317, 2978, 2986, 2978, 2970, 2968, 3003, 2983,
-+     2972, 2981, 2974, 2977, 2976, 2962, 2976,    0, 2977,    0,
-+     2957,    0, 2992,    0, 2970, 2974, 2965, 2958, 2971, 2967,
-+     2950,    0, 1316, 2954,    0, 2955, 1328,    0, 1352, 3314,
-+
-+     1373, 3314, 2948, 3314, 2972, 3314, 2974, 2973, 2972, 2971,
-+     2970, 2969, 2913, 2908, 2907, 2906, 2884, 1333, 2846, 2830,
-+     2818, 2811, 2813, 2808, 2807,    0, 2801,    0, 2813, 2798,
-+     2801, 2790, 2783,    0, 2738,    0, 2738, 2738,    0, 1328,
-+        0, 2725, 2743, 2742, 2682,    0,    0, 2677, 2642, 2651,
-+     1343, 2625, 2637, 2626, 2625, 2634, 2612, 2602, 1342, 2590,
-+     1384, 3314, 2612, 2611, 2604, 2603, 2602, 2598, 2597, 2593,
-+     2589, 2581, 2572, 2578, 2547, 2550, 2533, 2516, 2521, 2518,
-+     2482,    0, 2487, 2486, 2489,    0, 2469, 2472, 2470, 2462,
-+     2472, 2475, 2454, 2454, 1340, 2452, 2449, 2430, 3314, 2431,
-+
-+     2430, 2428, 2435, 2415, 2410,    0, 2427, 2427, 2405, 3314,
-+     2407, 2368, 2363, 2325, 1388, 3314, 1389, 3314, 3314, 3314,
-+     3314, 3314, 3314, 3314, 3314, 3314, 3314, 3314, 2328, 2287,
-+     2274, 2270, 2277, 2279, 2265, 2264, 2260, 2249, 2250, 2264,
-+     2231, 2226,    0, 2218, 2188, 2204, 2184, 1345, 2157, 2175,
-+     2154, 2151, 2161, 2162, 2144, 2116, 3314, 2092,    0, 2090,
-+     2074, 2083, 2084, 2074, 3314, 3314, 2080, 2073, 2042, 2050,
-+     2036, 2036, 2028, 2042, 2041,    0, 2024, 2021, 2036, 2028,
-+     2005, 1986, 1996, 1989, 1968, 1968, 1960, 1945, 1950, 3314,
-+     1936, 3314, 3314, 3314, 1921, 1922, 1908, 3314, 3314, 1899,
-+
-+     1896, 1889, 1902, 1886, 1867, 1862,    0,    0, 1869,    0,
-+     1849,    0, 1842, 1842, 1822, 1835, 1835, 1824, 1827, 3314,
-+     3314, 1816, 3314, 3314, 1812, 1825, 1813, 1802,    0, 1765,
-+     1741, 1720, 1734,    0, 1711, 3314, 1730, 1709, 1676, 1676,
-+     3314, 3314, 3314, 1686, 1673, 1657, 1647, 1651,   85,  122,
-+        0, 3314,  174, 3314,  612,  667,  693,  722,  912,  914,
-+      964, 3314, 3314, 1004, 1090,    0,    0, 1239, 1317, 1327,
-+        0, 1352, 1362,    0,    0, 3314, 1401, 1420, 1439, 1458,
-+     1477, 1496, 1515, 1534, 1553, 1572, 1591, 1610, 1629, 1648,
-+     1667, 1679, 1696, 1707, 1724, 1743, 1754, 1771, 1790, 1809,
-+
-+     1828, 1847, 1859, 1876, 1888, 1905, 1924, 1943, 1957, 1969,
-+     1986, 2005, 2024, 2043, 2062, 2074, 2091, 2104, 1383, 2121,
-+     2140, 2157, 2176, 2186, 2194, 2211, 2223, 2240, 2259, 2278,
-+     2289, 2298, 2317, 2336, 2355, 2374, 2393, 2412, 2431, 2450,
-+     2462, 2479, 2491, 2499, 2516, 2530, 2542, 2559, 2578, 2597,
-+     2616, 2628, 2645, 2658, 2675, 2694, 2711, 2730, 2749, 2761,
-+     2771, 2788, 2807, 2826, 2837, 2846, 2865, 2884, 2903, 2915,
-+     2932, 2951, 2970
-     } ;
- 
--static yyconst flex_int16_t yy_def[1070] =
-+static yyconst flex_int16_t yy_def[1074] =
-     {   0,
--      972,  972,  973,  973,  974,  975,  976,  976,  972,    9,
--      977,  977,  972,   13,  978,  978,  979,  979,  980,  980,
--      981,  981,  982,  982,  972,   25,  983,  983,  984,  984,
--      985,  985,  972,   33,  972,   35,  986,  986,  987,  987,
--      972,  972,  972,  972,  972,  988,  972,  972,  972,  972,
--      989,  972,  990,  972,  972,  972,  972,  972,  972,  972,
--      972,  991,  992,  993,  972,  972,  972,  972,  972,  972,
--      994,  972,  994,  995,  996,  995,  997,  972,  998,  972,
--      998,  972,  999,  999,  999,  998, 1000,  972,  972,  972,
--      972,  972,  972,  972,  972,  972, 1001,  972,  972,  972,
--
--      972,  972,  972,  972,  972,  972,  972,  972,  992,  972,
--      972,  992, 1002,  972,  972,  972, 1003,  972,  992,  972,
--     1004,  972, 1004,  972, 1005,  972, 1006, 1006, 1006,  972,
--      972, 1007,  972, 1007, 1008,  972, 1008,  972, 1009,  972,
--     1009,  972, 1010, 1011, 1011,  972, 1011, 1011,  972, 1011,
--     1012, 1012, 1012,  972,  972,  972,  972, 1013,  972,  972,
--      972, 1014, 1014, 1014, 1014, 1014, 1014, 1014, 1014, 1014,
--     1014, 1014, 1015, 1014, 1014, 1014, 1014, 1014, 1014, 1014,
--     1014, 1014,  972,  972, 1016,  972, 1017,  972,  972,  972,
--      972,  972,  972,  972,  988,  972,  972,  972,  972,  972,
--
--     1018, 1019,  972,  972,  972,  972, 1020, 1018, 1021, 1022,
--      972, 1023,  972,  972,  972,  972, 1024,  972,  972,  972,
--     1025, 1025, 1026,  972,  972, 1027,  972, 1028,  972,  972,
--      972,  972,  972,  972,  972, 1029,  972,  972, 1030,  972,
--     1031, 1032, 1032, 1033, 1034, 1035,  972, 1036,  972, 1037,
--     1037, 1037,  972, 1038,  972,  972,  972,  972,  972,  972,
--      972, 1039,  972,  972,  972, 1040,  972,  972,  972,  972,
--     1041,  972, 1042,  972, 1042,  972, 1043, 1043, 1043, 1044,
--      972, 1044, 1045,  972, 1045,  972, 1046,  972,  972, 1047,
--     1047, 1047,  972,  972, 1048, 1048, 1048,  972,  972, 1049,
--
--      972,  972,  972, 1050, 1050, 1050, 1050, 1050, 1050, 1050,
--     1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050,
--     1050, 1050,  972, 1050, 1050, 1050, 1050, 1050, 1050, 1050,
--     1050, 1050, 1050, 1050, 1051,  972,  972, 1052,  972,  972,
--     1053, 1054, 1055,  972,  972,  972,  972,  972,  972, 1056,
--     1053, 1057, 1058,  972, 1058,  972, 1059,  972, 1059,  972,
--     1060, 1060, 1060,  972, 1060, 1060,  972, 1061, 1062,  972,
--      972,  972,  972, 1063,  972, 1064, 1065, 1066, 1066,  972,
--      972,  380,  380, 1040, 1040, 1040, 1040, 1040, 1040, 1040,
--     1040, 1040, 1040, 1040, 1043, 1043,  294,  294, 1048, 1048,
--
--      972,  972, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050,
--     1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050,
--     1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050,
--     1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050,  972, 1050,
--     1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050,  972, 1055,
--     1055,  972, 1055, 1055,  972,  972,  972,  972, 1056, 1067,
--     1057,  972,  364, 1060,  366,  364, 1060,  366,  972,  972,
--      972,  972, 1066, 1066,  383,  972, 1040, 1040, 1040, 1040,
--     1040, 1040, 1040, 1040, 1040, 1040, 1040, 1043, 1043, 1048,
--     1048,  972,  972, 1050, 1050, 1050, 1050, 1050, 1050, 1050,
--
--     1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050,
--     1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050,
--     1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050,  972,  972,
--      972, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050,
--      972,  972, 1055, 1055,  972,  972,  972, 1067, 1067, 1067,
--      972,  463, 1060,  366, 1060, 1060, 1060,  972,  972, 1066,
--     1066,  972, 1040, 1040, 1040, 1040, 1040, 1040, 1040, 1040,
--     1040, 1040, 1040, 1040, 1043, 1043, 1048, 1048, 1050, 1050,
--     1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050,
--     1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050,
--
--     1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050,
--      972,  972,  972,  972, 1050, 1050, 1050, 1050, 1050, 1050,
--     1050, 1050, 1050,  972, 1068,  972,  972, 1067,  972, 1067,
--      972, 1060, 1060, 1060,  972,  972, 1066, 1066, 1040, 1040,
--     1040, 1040, 1040, 1040, 1040, 1040, 1040, 1040, 1040, 1040,
--     1043, 1043, 1048, 1048, 1050, 1050, 1050, 1050, 1050, 1050,
--     1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050,
--     1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050,
--     1050,  972,  972,  972,  972, 1050, 1050, 1050,  972, 1050,
--     1050, 1050,  972, 1050, 1068,  972, 1068,  972,  972,  972,
--
--      972,  972, 1040, 1040, 1040, 1040, 1040, 1040, 1040, 1040,
--     1040, 1040, 1040, 1040, 1050, 1050, 1050, 1050, 1050, 1050,
--     1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050,
--     1050, 1050, 1050, 1050, 1050, 1050, 1050,  972,  972,  972,
--      972, 1050, 1050,  972,  972,  972,  972,  972,  972, 1050,
--     1050,  972,  972,  972,  972,  972, 1069,  972,  972,  972,
--      972,  972,  972,  972,  972,  972,  972,  972,  972, 1040,
--     1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050,
--     1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050,  972,  972,
--      972,  972,  972,  972,  972,  972,  972,  972,  972,  972,
--
--      972, 1050, 1050,  972,  972,  972,  972,  972,  972,  972,
--     1069,  972, 1069,  972,  972,  972,  972,  972,  972,  972,
--      972,  972,  972,  972,  972, 1050, 1050, 1050, 1050, 1050,
--     1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050,
--     1050,  972,  972,  972,  972,  972,  972,  972,  972,  972,
--      972,  972,  972,  972, 1050,  972,  972,  972,  972,  972,
--      972,  972, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050,
--     1050, 1050, 1050, 1050, 1050, 1050, 1050,  972,  972,  972,
--      972,  972,  972,  972,  972,  972,  972,  972,  972,  972,
--      972,  972,  972,  972,  972, 1050, 1050, 1050, 1050, 1050,
--
--     1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050,  972,
--      972,  972,  972,  972,  972,  972,  972,  972,  972,  972,
--      972, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050,
--     1050,  972,  972,  972,  972,  972,  972,  972,  972, 1050,
--     1050, 1050, 1050, 1050, 1050, 1050, 1050,  972,  972,  972,
--      972, 1050, 1050, 1050, 1050, 1050, 1050,  972,  972, 1050,
--     1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050,
--     1050,    0,  972,  972,  972,  972,  972,  972,  972,  972,
--      972,  972,  972,  972,  972,  972,  972,  972,  972,  972,
--      972,  972,  972,  972,  972,  972,  972,  972,  972,  972,
--
--      972,  972,  972,  972,  972,  972,  972,  972,  972,  972,
--      972,  972,  972,  972,  972,  972,  972,  972,  972,  972,
--      972,  972,  972,  972,  972,  972,  972,  972,  972,  972,
--      972,  972,  972,  972,  972,  972,  972,  972,  972,  972,
--      972,  972,  972,  972,  972,  972,  972,  972,  972,  972,
--      972,  972,  972,  972,  972,  972,  972,  972,  972,  972,
--      972,  972,  972,  972,  972,  972,  972,  972,  972
-+      976,  976,  977,  977,  978,  979,  980,  980,  976,    9,
-+      981,  981,  976,   13,  982,  982,  983,  983,  984,  984,
-+      985,  985,  986,  986,  976,   25,  987,  987,  988,  988,
-+      989,  989,  976,   33,  976,   35,  990,  990,  991,  991,
-+      976,  976,  976,  976,  976,  992,  976,  976,  976,  976,
-+      993,  976,  994,  976,  976,  976,  976,  976,  976,  976,
-+      976,  995,  996,  997,  976,  976,  976,  976,  976,  976,
-+      998,  976,  998,  999, 1000,  999, 1001,  976, 1002,  976,
-+     1002,  976, 1003, 1003, 1003, 1002, 1004,  976,  976,  976,
-+      976,  976,  976,  976,  976,  976, 1005,  976,  976,  976,
-+
-+      976,  976,  976,  976,  976,  976,  976,  976,  996,  976,
-+      976,  996, 1006,  976,  976,  976, 1007,  976,  996,  976,
-+     1008,  976, 1008,  976, 1009,  976, 1010, 1010, 1010,  976,
-+      976, 1011,  976, 1011, 1012,  976, 1012,  976,  976,  976,
-+     1013,  976, 1013,  976, 1014, 1015, 1015,  976, 1015, 1015,
-+      976, 1015, 1016, 1016, 1016,  976,  976,  976,  976, 1017,
-+      976,  976,  976, 1018, 1018, 1018, 1018, 1018, 1018, 1018,
-+     1018, 1018, 1018, 1018, 1019, 1018, 1018, 1018, 1018, 1018,
-+     1018, 1018, 1018, 1018,  976,  976, 1020,  976, 1021,  976,
-+      976,  976,  976,  976,  976,  976,  992,  976,  976,  976,
-+
-+      976,  976, 1022, 1023,  976,  976,  976,  976, 1024, 1022,
-+     1025, 1026,  976, 1027,  976,  976,  976,  976, 1028,  976,
-+      976,  976, 1029, 1029, 1030,  976,  976, 1031,  976, 1032,
-+      976,  976,  976,  976,  976,  976,  976, 1033,  976,  976,
-+     1034,  976, 1035, 1036, 1036, 1037, 1038, 1039,  976, 1040,
-+      976, 1041, 1041, 1041,  976, 1042,  976,  976,  976,  976,
-+      976,  976,  976, 1043,  976,  976,  976, 1044,  976,  976,
-+      976,  976, 1045,  976, 1046,  976, 1046,  976, 1047, 1047,
-+     1047, 1048,  976, 1048, 1049,  976, 1049,  976,  976,  976,
-+     1050,  976,  976, 1051, 1051, 1051,  976,  976, 1052, 1052,
-+
-+     1052,  976,  976, 1053,  976,  976,  976, 1054, 1054, 1054,
-+     1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054,
-+     1054, 1054, 1054, 1054, 1054, 1054,  976, 1054, 1054, 1054,
-+     1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1055,  976,
-+      976, 1056,  976,  976, 1057, 1058, 1059,  976,  976,  976,
-+      976,  976,  976, 1060, 1057, 1061, 1062,  976, 1062,  976,
-+     1063,  976, 1063,  976, 1064, 1064, 1064,  976, 1064, 1064,
-+      976, 1065, 1066,  976,  976,  976,  976, 1067,  976, 1068,
-+     1069, 1070, 1070,  976,  976,  384,  384, 1044, 1044, 1044,
-+     1044, 1044, 1044, 1044, 1044, 1044, 1044, 1044, 1047, 1047,
-+
-+      298,  298, 1052, 1052,  976,  976, 1054, 1054, 1054, 1054,
-+     1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054,
-+     1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054,
-+     1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054,
-+     1054, 1054,  976, 1054, 1054, 1054, 1054, 1054, 1054, 1054,
-+     1054, 1054,  976, 1059, 1059,  976, 1059, 1059,  976,  976,
-+      976,  976, 1060, 1071, 1061,  976,  368, 1064,  370,  368,
-+     1064,  370,  976,  976,  976,  976, 1070, 1070,  387,  976,
-+     1044, 1044, 1044, 1044, 1044, 1044, 1044, 1044, 1044, 1044,
-+     1044, 1047, 1047, 1052, 1052,  976,  976, 1054, 1054, 1054,
-+
-+     1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054,
-+     1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054,
-+     1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054,
-+     1054, 1054,  976,  976,  976, 1054, 1054, 1054, 1054, 1054,
-+     1054, 1054, 1054, 1054,  976,  976, 1059, 1059,  976,  976,
-+      976, 1071, 1071, 1071,  976,  467, 1064,  370, 1064, 1064,
-+     1064,  976,  976, 1070, 1070,  976, 1044, 1044, 1044, 1044,
-+     1044, 1044, 1044, 1044, 1044, 1044, 1044, 1044, 1047, 1047,
-+     1052, 1052, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054,
-+     1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054,
-+
-+     1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054,
-+     1054, 1054, 1054, 1054,  976,  976,  976,  976, 1054, 1054,
-+     1054, 1054, 1054, 1054, 1054, 1054, 1054,  976, 1072,  976,
-+      976, 1071,  976, 1071,  976, 1064, 1064, 1064,  976,  976,
-+     1070, 1070, 1044, 1044, 1044, 1044, 1044, 1044, 1044, 1044,
-+     1044, 1044, 1044, 1044, 1047, 1047, 1052, 1052, 1054, 1054,
-+     1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054,
-+     1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054,
-+     1054, 1054, 1054, 1054, 1054,  976,  976,  976,  976, 1054,
-+     1054, 1054,  976, 1054, 1054, 1054,  976, 1054, 1072,  976,
-+
-+     1072,  976,  976,  976,  976,  976, 1044, 1044, 1044, 1044,
-+     1044, 1044, 1044, 1044, 1044, 1044, 1044, 1044, 1054, 1054,
-+     1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054,
-+     1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054,
-+     1054,  976,  976,  976,  976, 1054, 1054,  976,  976,  976,
-+      976,  976,  976, 1054, 1054,  976,  976,  976,  976,  976,
-+     1073,  976,  976,  976,  976,  976,  976,  976,  976,  976,
-+      976,  976,  976, 1044, 1054, 1054, 1054, 1054, 1054, 1054,
-+     1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054,
-+     1054, 1054,  976,  976,  976,  976,  976,  976,  976,  976,
-+
-+      976,  976,  976,  976,  976, 1054, 1054,  976,  976,  976,
-+      976,  976,  976,  976, 1073,  976, 1073,  976,  976,  976,
-+      976,  976,  976,  976,  976,  976,  976,  976,  976, 1054,
-+     1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054,
-+     1054, 1054, 1054, 1054, 1054,  976,  976,  976,  976,  976,
-+      976,  976,  976,  976,  976,  976,  976,  976, 1054,  976,
-+      976,  976,  976,  976,  976,  976, 1054, 1054, 1054, 1054,
-+     1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054,
-+     1054,  976,  976,  976,  976,  976,  976,  976,  976,  976,
-+      976,  976,  976,  976,  976,  976,  976,  976,  976, 1054,
-+
-+     1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054,
-+     1054, 1054, 1054,  976,  976,  976,  976,  976,  976,  976,
-+      976,  976,  976,  976,  976, 1054, 1054, 1054, 1054, 1054,
-+     1054, 1054, 1054, 1054, 1054,  976,  976,  976,  976,  976,
-+      976,  976,  976, 1054, 1054, 1054, 1054, 1054, 1054, 1054,
-+     1054,  976,  976,  976,  976, 1054, 1054, 1054, 1054, 1054,
-+     1054,  976,  976, 1054, 1054, 1054, 1054, 1054, 1054, 1054,
-+     1054, 1054, 1054, 1054, 1054,    0,  976,  976,  976,  976,
-+      976,  976,  976,  976,  976,  976,  976,  976,  976,  976,
-+      976,  976,  976,  976,  976,  976,  976,  976,  976,  976,
-+
-+      976,  976,  976,  976,  976,  976,  976,  976,  976,  976,
-+      976,  976,  976,  976,  976,  976,  976,  976,  976,  976,
-+      976,  976,  976,  976,  976,  976,  976,  976,  976,  976,
-+      976,  976,  976,  976,  976,  976,  976,  976,  976,  976,
-+      976,  976,  976,  976,  976,  976,  976,  976,  976,  976,
-+      976,  976,  976,  976,  976,  976,  976,  976,  976,  976,
-+      976,  976,  976,  976,  976,  976,  976,  976,  976,  976,
-+      976,  976,  976
-     } ;
- 
--static yyconst flex_int16_t yy_nxt[3300] =
-+static yyconst flex_int16_t yy_nxt[3374] =
-     {   0,
-        42,   43,   44,   42,   45,   42,   42,   42,   42,   42,
-        42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
-@@ -770,19 +772,19 @@
- 
-        53,   53,   53,   53,   53,   53,   53,   53,   53,   53,
-        53,   53,   53,   53,   53,   42,   42,   42,   55,   56,
--      476,   57,   58,   72,   59,   73,   42,   60,   60,   60,
--       75,   72,   60,   73,  133,  645,  134,   76,   61,   88,
--       89,  476,   90,   62,   63,   88,   89,  100,   90,  101,
--      111,  112,  199,  113,  100,  133,  101,  134,  102,  222,
--      223,  103,  103,  103,  103,  102,  274,  485,  103,  103,
--      103,  103,  958,   64,   60,   60,   65,   66,  322,   67,
--       58,   42,   59,   68,  275,   60,   60,   60,  323,  106,
--       60,  107,  108,  200,  274,  106,   69,  107,  108,  362,
--
--      363,   62,   63,  104,   70,  111,  112,  136,  113,  137,
--      104,  268,  275,  136,  109,  137,  138,  656,  192,  193,
--      109,  194,  138,  196,  197,  268,  198,  218,  218,  657,
--      219,   64,   60,   60,   79,   79,   80,   79,   81,   79,
-+      726,   57,   58,   72,   59,   73,   42,   60,   60,   60,
-+       75,   72,   60,   73,  133,  526,  134,   76,   61,   88,
-+       89,  527,   90,   62,   63,   88,   89,  100,   90,  101,
-+      111,  112,  201,  113,  100,  133,  101,  134,  102,  224,
-+      225,  103,  103,  103,  103,  102,  276,  238,  103,  103,
-+      103,  103,  961,   64,   60,   60,   65,   66,  326,   67,
-+       58,   42,   59,   68,  277,   60,   60,   60,  327,  106,
-+       60,  107,  108,  202,  411,  106,   69,  107,  108,  276,
-+
-+      295,   62,   63,  104,   70,  111,  112,  296,  113,  186,
-+      104,  412,  187,  186,  109,  239,  187,  277,  194,  195,
-+      109,  196,  962,  188,  188,  188,  188,  188,  188,  188,
-+      188,   64,   60,   60,   79,   79,   80,   79,   81,   79,
-        79,   79,   79,   79,   79,   82,   79,   79,   79,   79,
-        79,   79,   79,   79,   79,   79,   79,   79,   83,   83,
-        79,   79,   79,   79,   83,   83,   83,   83,   83,   83,
-@@ -795,9 +797,9 @@
-        91,   91,   91,   97,   97,   97,   97,   97,   97,   97,
-        97,   97,   97,   97,   97,   97,   97,   97,   97,   97,
-        97,   97,   97,   97,   97,   97,   97,   97,   97,   91,
--       91,   91,  115,  787,  116,  115,  184,  116,  291,  185,
--      227,  227,  227,  227,  117,  292,  244,  117,  245,  788,
--      186,  186,  186,  186,  367,  367,  118,  119,  120,  118,
-+       91,   91,  115,  480,  116,  115,  323,  116,  198,  199,
-+      324,  200,  220,  220,  117,  221,  651,  117,  229,  229,
-+      229,  229,  246,  283,  247,  284,  118,  119,  120,  118,
-       119,  120,  121,  121,  122,  121,  123,  124,  121,  121,
-       121,  125,  121,  121,  121,  121,  121,  126,  121,  121,
- 
-@@ -805,324 +807,332 @@
-       121,  121,  127,  127,  127,  127,  127,  127,  127,  127,
-       127,  127,  127,  127,  127,  127,  127,  127,  127,  127,
-       128,  127,  127,  127,  127,  127,  127,  129,  130,  121,
--      131,  140,  959,  141,  142,  140,  184,  141,  142,  185,
--      257,  258,  364,  259,  264,  264,  264,  264,  362,  363,
--      186,  186,  186,  186,  319,  281,  143,  282,  320,  960,
--      143,  144,  145,  146,  144,  147,  144,  144,  144,  148,
--      144,  144,  149,  144,  144,  144,  150,  144,  144,  144,
--      144,  144,  144,  144,  144,  151,  151,  144,  144,  144,
--
--      144,  151,  151,  151,  151,  151,  151,  151,  151,  151,
--      151,  151,  151,  151,  151,  151,  151,  151,  151,  152,
--      151,  151,  151,  151,  151,  151,  153,  144,  144,  144,
--      154,  155,  156,  154,  157,  158,  154,  154,  154,  154,
--      154,  154,  154,  154,  154,  154,  154,  159,  160,  154,
--      154,  154,  161,  154,  154,  154,  154,  154,  154,  154,
--      154,  162,  163,  164,  165,  166,  167,  168,  169,  170,
--      168,  168,  171,  172,  173,  174,  175,  168,  176,  177,
--      178,  179,  180,  181,  168,  182,  154,  154,  154,  188,
--      188,  189,  189,  213,  214,  961,  215,  225,  225,  314,
--
--      216,  229,  230,  236,  231,  281,  308,  282,  232,  310,
--      225,  225,  225,  225,  309,  233,  225,  225,  284,  315,
--      285,  234,  284,  325,  285,  305,  199,  306,  311,  235,
--      354,  307,  355,  326,  962,  226,  327,  337,  337,  337,
--      337,  365,  365,  190,  190,  191,  191,  202,  226,  217,
--      226,  237,  192,  193,  226,  194,  407,  217,  196,  197,
--      358,  198,  359,  257,  258,  476,  259,  200,  213,  214,
--      203,  215,  204,  408,  204,  216,  281,  412,  282,  366,
--      204,  413,  418,  204,  205,  206,  419,  204,  207,  208,
--      482,  343,  344,  209,  345,  210,  343,  344,  291,  345,
--
--      343,  344,  281,  345,  282,  292,  346,  346,  346,  346,
--      963,  346,  346,  346,  346,  346,  346,  346,  346,  343,
--      344,  284,  345,  285,  217,  403,  229,  230,  284,  231,
--      285,  362,  363,  232,  346,  346,  346,  346,  347,  404,
--      233,  264,  264,  264,  264,  348,  234,  426,  432,  429,
--      476,  433,  435,  430,  235,  224,  224,  427,  431,  436,
--      354,  565,  355,  349,  337,  337,  337,  337,  354,  358,
--      355,  359,  358,  463,  359,  470,  470,  470,  470,  362,
--      363,  964,  217,  380,  380,  381,  380,  382,  380,  380,
--      380,  380,  380,  380,  383,  380,  380,  380,  380,  380,
--
--      380,  380,  380,  380,  380,  380,  380,  383,  383,  380,
--      380,  380,  380,  383,  383,  383,  383,  383,  383,  383,
--      383,  383,  383,  383,  383,  383,  383,  383,  383,  383,
--      383,  383,  383,  383,  383,  383,  383,  383,  383,  380,
--      380,  380,  385,  386,  387,  388,  476,  476,  389,  522,
--      542,  965,  543,  390,  452,  523,  543,  391,  611,  880,
--      392,  487,  393,  881,  612,  394,  397,  397,  477,  397,
--      397,  397,  397,  397,  397,  397,  397,  398,  397,  397,
--      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
--      398,  398,  397,  397,  397,  397,  398,  398,  398,  398,
--
--      398,  398,  398,  398,  398,  398,  398,  398,  398,  398,
--      398,  398,  398,  398,  398,  398,  398,  398,  398,  398,
--      398,  398,  397,  397,  397,  439,  440,  476,  441,  464,
--      464,  442,  443,  476,  476,  476,  476,  444,  445,  451,
--      452,  361,  453,  446,  447,  476,  455,  344,  448,  345,
--      966,  479,  480,  476,  454,  454,  454,  454,  478,  967,
--      486,  346,  346,  346,  346,  566,  705,  465,  361,  361,
--      567,  361,  361,  361,  361,  361,  361,  361,  361,  361,
--      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
--      361,  361,  466,  466,  362,  363,  549,  361,  361,  466,
--
--      466,  466,  466,  466,  466,  466,  466,  466,  466,  466,
--      466,  466,  466,  466,  466,  466,  466,  466,  466,  466,
--      466,  466,  466,  466,  361,  361,  361,  467,  467,  529,
--      362,  363,  530,  531,  476,  362,  363,  362,  363,  468,
--      468,  468,  468,  455,  344,  568,  345,  468,  778,  362,
--      363,  550,  362,  363,  468,  468,  468,  468,  468,  468,
--      380,  380,  381,  380,  382,  380,  380,  380,  380,  380,
--      380,  383,  380,  380,  380,  380,  380,  380,  380,  380,
--      380,  380,  380,  380,  383,  383,  380,  380,  380,  380,
--      383,  383,  383,  383,  383,  383,  383,  383,  383,  383,
--
--      383,  383,  383,  383,  383,  383,  383,  383,  383,  383,
--      383,  383,  383,  383,  383,  383,  380,  380,  380,  383,
--      383,  476,  383,  475,  383,  383,  383,  383,  383,  383,
--      476,  383,  383,  383,  383,  383,  383,  383,  383,  383,
--      383,  383,  383,  476,  476,  383,  383,  383,  383,  481,
--      451,  452,  968,  453,  544,  452,  476,  453,  483,  649,
--      969,  484,  570,  553,  553,  454,  454,  454,  454,  454,
--      454,  454,  454,  362,  363,  383,  383,  383,  398,  398,
--      476,  398,  398,  398,  398,  398,  398,  398,  398,  569,
--      398,  398,  398,  398,  398,  398,  398,  398,  398,  398,
--
--      398,  398,  556,  556,  398,  398,  398,  398,  476,  476,
--      476,  639,  362,  363,  476,  476,  542,  476,  543,  549,
--      572,  544,  452,  476,  453,  628,  629,  970,  630,  574,
--      971,  696,  571,  697,  398,  398,  398,  552,  552,  563,
--      573,  564,  643,  644,  552,  552,  552,  552,  552,  552,
--      552,  552,  552,  552,  552,  552,  552,  552,  552,  552,
--      552,  552,  552,  552,  552,  552,  552,  552,  552,  554,
--      554,  554,  554,  586,  550,  476,  476,  554,  362,  363,
--      221,  362,  363,  476,  554,  554,  554,  554,  554,  554,
--      557,  557,  557,  557,  640,  587,  476,  957,  557,  641,
--
--      722,  588,  633,  633,  476,  557,  557,  557,  557,  557,
--      557,  642,  362,  363,  634,  634,  634,  634,  660,  476,
--      646,  650,  634,  476,  476,  362,  363,  361,  661,  634,
--      634,  634,  634,  634,  634,  476,  647,  648,  628,  629,
--      476,  630,  703,  476,  476,  476,  704,  476,  476,  476,
--      476,  476,  696,  844,  697,  718,  696,  476,  697,  812,
--      956,  813,  706,  708,  712,  719,  321,  321,  807,  714,
--      845,  808,  709,  707,  955,  744,  745,  710,  711,  713,
--      746,  809,  954,  747,  752,  753,  748,  770,  953,  754,
--      796,  749,  755,  952,  797,  756,  812,  798,  813,  812,
-+      131,  136,  136,  137,  137,  142,  295,  143,  144,  480,
-+      138,  138,  142,  296,  143,  144,  259,  260,  270,  261,
-+      266,  266,  266,  266,  649,  139,  139,  140,  140,  283,
-+      145,  284,  270,  286,  286,  287,  287,  145,  146,  147,
-+      148,  146,  149,  146,  146,  146,  150,  146,  146,  151,
-+      146,  146,  146,  152,  146,  146,  146,  146,  146,  146,
-+
-+      146,  146,  153,  153,  146,  146,  146,  146,  153,  153,
-+      153,  153,  153,  153,  153,  153,  153,  153,  153,  153,
-+      153,  153,  153,  153,  153,  153,  154,  153,  153,  153,
-+      153,  153,  153,  155,  146,  146,  146,  156,  157,  158,
-+      156,  159,  160,  156,  156,  156,  156,  156,  156,  156,
-+      156,  156,  156,  156,  161,  162,  156,  156,  156,  163,
-+      156,  156,  156,  156,  156,  156,  156,  156,  164,  165,
-+      166,  167,  168,  169,  170,  171,  172,  170,  170,  173,
-+      174,  175,  176,  177,  170,  178,  179,  180,  181,  182,
-+      183,  170,  184,  156,  156,  156,  190,  190,  191,  191,
-+
-+      215,  216,  314,  217,  227,  227,  312,  218,  231,  232,
-+      309,  233,  310,  318,  313,  234,  311,  227,  227,  227,
-+      227,  315,  235,  227,  227,  329,  201,  439,  236,  341,
-+      341,  341,  341,  319,  440,  330,  237,  358,  331,  359,
-+      194,  195,  228,  196,  198,  199,  362,  200,  363,  963,
-+      192,  192,  193,  193,  204,  228,  219,  228,  366,  367,
-+      407,  228,  371,  371,  219,  480,  368,  202,  347,  348,
-+      430,  349,  366,  367,  408,  215,  216,  205,  217,  206,
-+      431,  206,  218,  350,  350,  350,  350,  206,  707,  416,
-+      206,  207,  208,  417,  206,  209,  210,  369,  369,  283,
-+
-+      211,  284,  212,  347,  348,  422,  349,  347,  348,  423,
-+      349,  347,  348,  436,  349,  351,  437,  964,  350,  350,
-+      350,  350,  350,  350,  350,  350,  350,  350,  350,  350,
-+      283,  219,  284,  231,  232,  370,  233,  965,  259,  260,
-+      234,  261,  266,  266,  266,  266,  286,  235,  287,  286,
-+      433,  287,  352,  236,  434,  353,  480,  455,  456,  435,
-+      457,  237,  341,  341,  341,  341,  459,  348,  358,  349,
-+      359,  966,  458,  458,  458,  458,  358,  362,  359,  363,
-+      483,  350,  350,  350,  350,  362,  546,  363,  547,  219,
-+      384,  384,  385,  384,  386,  384,  384,  384,  384,  384,
-+
-+      384,  387,  384,  384,  384,  384,  384,  384,  384,  384,
-+      384,  384,  384,  384,  387,  387,  384,  384,  384,  384,
-+      387,  387,  387,  387,  387,  387,  387,  387,  387,  387,
-+      387,  387,  387,  387,  387,  387,  387,  387,  387,  387,
-+      387,  387,  387,  387,  387,  387,  384,  384,  384,  389,
-+      390,  391,  392,  366,  367,  393,  467,  226,  226,  480,
-+      394,  480,  366,  367,  395,  615,  456,  396,  547,  397,
-+      569,  616,  398,  401,  401,  491,  401,  401,  401,  401,
-+      401,  401,  401,  401,  402,  401,  401,  401,  401,  401,
-+      401,  401,  401,  401,  401,  401,  401,  402,  402,  401,
-+
-+      401,  401,  401,  402,  402,  402,  402,  402,  402,  402,
-+      402,  402,  402,  402,  402,  402,  402,  402,  402,  402,
-+      402,  402,  402,  402,  402,  402,  402,  402,  402,  401,
-+      401,  401,  443,  444,  480,  445,  468,  468,  446,  447,
-+      480,  480,  471,  471,  448,  449,  480,  480,  365,  480,
-+      450,  451,  366,  367,  480,  452,  474,  474,  474,  474,
-+      489,  967,  481,  482,  533,  484,  968,  534,  535,  653,
-+      459,  348,  486,  349,  469,  365,  365,  485,  365,  365,
-+      365,  365,  365,  365,  365,  365,  365,  365,  365,  365,
-+      365,  365,  365,  365,  365,  365,  365,  365,  365,  470,
-+
-+      470,  366,  367,  969,  365,  365,  470,  470,  470,  470,
-+      470,  470,  470,  470,  470,  470,  470,  470,  470,  470,
-+      470,  470,  470,  470,  470,  470,  470,  470,  470,  470,
-+      470,  365,  365,  365,  472,  472,  472,  472,  546,  700,
-+      547,  701,  472,  970,  366,  367,  366,  367,  223,  472,
-+      472,  472,  472,  472,  472,  384,  384,  385,  384,  386,
-+      384,  384,  384,  384,  384,  384,  387,  384,  384,  384,
-+      384,  384,  384,  384,  384,  384,  384,  384,  384,  387,
-+      387,  384,  384,  384,  384,  387,  387,  387,  387,  387,
-+      387,  387,  387,  387,  387,  387,  387,  387,  387,  387,
-+
-+      387,  387,  387,  387,  387,  387,  387,  387,  387,  387,
-+      387,  384,  384,  384,  387,  387,  480,  387,  479,  387,
-+      387,  387,  387,  387,  387,  480,  387,  387,  387,  387,
-+      387,  387,  387,  387,  387,  387,  387,  387,  480,  971,
-+      387,  387,  387,  387,  487,  455,  456,  488,  457,  548,
-+      456,  490,  457,  553,  480,  571,  480,  553,  557,  557,
-+      458,  458,  458,  458,  458,  458,  458,  458,  366,  367,
-+      387,  387,  387,  402,  402,  574,  402,  402,  402,  402,
-+      402,  402,  402,  402,  570,  402,  402,  402,  402,  402,
-+      402,  402,  402,  402,  402,  402,  402,  480,  480,  402,
-+
-+      402,  402,  402,  560,  560,  480,  480,  480,  554,  572,
-+      480,  480,  554,  366,  367,  548,  456,  576,  457,  632,
-+      633,  567,  634,  568,  366,  367,  578,  366,  367,  402,
-+      402,  402,  556,  556,  575,  366,  367,  577,  573,  556,
-+      556,  556,  556,  556,  556,  556,  556,  556,  556,  556,
-+      556,  556,  556,  556,  556,  556,  556,  556,  556,  556,
-+      556,  556,  556,  556,  558,  558,  558,  558,  590,  480,
-+      480,  480,  558,  480,  782,  480,  366,  367,  365,  558,
-+      558,  558,  558,  558,  558,  561,  561,  561,  561,  644,
-+      591,  480,  647,  561,  645,  648,  592,  637,  637,  480,
-+
-+      561,  561,  561,  561,  561,  561,  643,  366,  367,  638,
-+      638,  638,  638,  480,  366,  367,  480,  638,  480,  646,
-+      660,  480,  480,  650,  638,  638,  638,  638,  638,  638,
-+      654,  652,  661,  664,  632,  633,  480,  634,  710,  480,
-+      480,  480,  709,  665,  480,  480,  480,  708,  480,  722,
-+      748,  749,  711,  480,  700,  750,  701,  712,  751,  723,
-+      716,  752,  756,  757,  791,  718,  753,  758,  713,  972,
-+      759,  714,  848,  760,  715,  700,  717,  701,  800,  973,
-+      792,  811,  801,  774,  812,  802,  816,  974,  817,  849,
-+      816,  816,  817,  817,  813,  803,  884,  975,  325,  325,
- 
--      951,  813,  950,  949,  948,  947,  946,  799,   54,   54,
-+      885,   54,   54,   54,   54,   54,   54,   54,   54,   54,
-        54,   54,   54,   54,   54,   54,   54,   54,   54,   54,
--       54,   54,   54,   54,   54,   54,   71,   71,   71,   71,
-        71,   71,   71,   71,   71,   71,   71,   71,   71,   71,
--       71,   71,   71,   71,   74,   74,   74,   74,   74,   74,
-+       71,   71,   71,   71,   71,   71,   71,   71,   71,   74,
-        74,   74,   74,   74,   74,   74,   74,   74,   74,   74,
--       74,   74,   77,   77,   77,   77,   77,   77,   77,   77,
-+       74,   74,   74,   74,   74,   74,   74,   74,   77,   77,
-        77,   77,   77,   77,   77,   77,   77,   77,   77,   77,
-+       77,   77,   77,   77,   77,   77,   77,   87,   87,   87,
-        87,   87,   87,   87,   87,   87,   87,   87,   87,   87,
--       87,   87,   87,   87,   87,   87,   87,   87,   42,   42,
-+       87,   87,   87,   87,   87,   87,   42,   42,   42,   42,
- 
-        42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
--       42,   42,   42,   42,   42,   42,   99,   99,   99,   99,
-+       42,   42,   42,   42,   42,   99,   99,   99,   99,   99,
-        99,   99,   99,   99,   99,   99,   99,   99,   99,   99,
-        99,   99,   99,   99,  105,  105,  105,  105,  105,  105,
-       105,  105,  105,  105,  105,  105,  105,  105,  105,  105,
--      105,  105,  110,  110,  110,  110,  110,  110,  110,  110,
-+      105,  105,  105,  110,  110,  110,  110,  110,  110,  110,
-       110,  110,  110,  110,  110,  110,  110,  110,  110,  110,
-+      110,  110,  114,  114,  114,  114,  114,  114,  114,  114,
-       114,  114,  114,  114,  114,  114,  114,  114,  114,  114,
--      114,  114,  114,  114,  114,  114,  114,  114,  132,  132,
--      132,  132,  132,  132,  132,  132,  132,  132,  132,  132,
-+      114,  132,  132,  132,  132,  132,  132,  132,  132,  132,
- 
--      132,  132,  132,  132,  132,  132,  135,  135,  135,  135,
-+      132,  132,  132,  132,  132,  132,  132,  132,  132,  132,
-       135,  135,  135,  135,  135,  135,  135,  135,  135,  135,
--      135,  135,  135,  135,  139,  139,  139,  139,  139,  139,
--      139,  139,  139,  139,  139,  139,  139,  139,  139,  139,
--      139,  139,  183,  183,  183,  183,  183,  183,  183,  183,
--      183,  183,  183,  183,  183,  183,  183,  183,  183,  183,
--      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
--      187,  187,  187,  187,  187,  187,  187,  187,  195,  195,
--      195,  195,  945,  944,  195,  195,  195,  201,  201,  201,
--      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
--
--      201,  201,  201,  201,  212,  212,  212,  212,  943,  942,
--      212,  212,  212,  221,  941,  221,  221,  221,  221,  221,
--      221,  221,  221,  221,  221,  221,  221,  221,  221,  221,
--      221,  224,  940,  224,  224,  224,  224,  224,  224,  224,
--      224,  224,  224,  224,  224,  224,  224,  224,  224,  228,
--      228,  228,  939,  938,  228,  228,  228,  239,  937,  239,
--      239,  239,  239,  239,  239,  239,  239,  239,  239,  239,
--      239,  239,  239,  239,  239,  241,  936,  241,  241,  241,
-+      135,  135,  135,  135,  135,  135,  135,  135,  135,  141,
-+      141,  141,  141,  141,  141,  141,  141,  141,  141,  141,
-+      141,  141,  141,  141,  141,  141,  141,  141,  185,  185,
-+      185,  185,  185,  185,  185,  185,  185,  185,  185,  185,
-+      185,  185,  185,  185,  185,  185,  185,  189,  189,  189,
-+      189,  189,  189,  189,  189,  189,  189,  189,  189,  189,
-+      189,  189,  189,  189,  189,  189,  197,  197,  197,  197,
-+      960,  959,  958,  197,  197,  197,  203,  203,  203,  203,
-+
-+      203,  203,  203,  203,  203,  203,  203,  203,  203,  203,
-+      203,  203,  203,  203,  214,  214,  214,  214,  957,  956,
-+      955,  214,  214,  214,  223,  954,  223,  223,  223,  223,
-+      223,  223,  223,  223,  223,  223,  223,  223,  223,  223,
-+      223,  223,  223,  226,  953,  226,  226,  226,  226,  226,
-+      226,  226,  226,  226,  226,  226,  226,  226,  226,  226,
-+      226,  226,  230,  230,  230,  952,  951,  950,  230,  230,
-+      230,  241,  949,  241,  241,  241,  241,  241,  241,  241,
-       241,  241,  241,  241,  241,  241,  241,  241,  241,  241,
--      241,  241,  241,  242,  935,  242,  242,  242,  242,  242,
-+      243,  948,  243,  243,  243,  243,  243,  243,  243,  243,
- 
--      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
--      242,  246,  246,  246,  246,  246,  246,  246,  246,  246,
--      246,  246,  246,  246,  246,  246,  246,  246,  246,  248,
--      934,  248,  248,  248,  933,  248,  248,  248,  932,  931,
--      248,  248,  930,  929,  928,  248,  248,  250,  250,  250,
--      250,  927,  926,  250,  250,  250,  254,  925,  924,  254,
--      254,  254,  254,  254,  254,  254,  254,  254,  254,  254,
--      254,  254,  254,  254,  262,  262,  262,  262,  923,  922,
--      262,  262,  262,  267,  921,  267,  267,  267,  267,  267,
--      267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
--
--      267,  270,  920,  270,  270,  270,  270,  270,  270,  270,
--      270,  270,  270,  919,  270,  270,  270,  270,  270,  271,
--      918,  271,  917,  916,  271,  271,  271,  271,  915,  914,
--      271,  271,  273,  913,  273,  273,  273,  273,  273,  273,
--      273,  273,  273,  273,  273,  273,  273,  273,  273,  273,
--      277,  277,  277,  277,  912,  911,  277,  277,  277,  280,
--      280,  280,  280,  280,  280,  280,  280,  280,  280,  280,
--      280,  280,  280,  280,  280,  280,  280,  283,  283,  283,
--      283,  283,  910,  283,  283,  283,  283,  283,  283,  283,
--      283,  283,  283,  283,  283,  287,  909,  287,  908,  287,
--
--      287,  287,  287,  287,  287,  287,  907,  287,  287,  287,
--      287,  287,  287,  289,  906,  289,  289,  289,  289,  289,
--      289,  289,  289,  289,  289,  289,  289,  289,  289,  289,
--      289,  290,  905,  290,  290,  290,  904,  290,  290,  290,
--      903,  902,  290,  290,  901,  900,  899,  290,  290,  295,
--      295,  295,  295,  898,  897,  295,  295,  295,  300,  896,
--      300,  300,  300,  300,  300,  300,  300,  300,  300,  300,
--      300,  300,  300,  300,  300,  300,  304,  304,  895,  304,
--      304,  894,  893,  892,  304,  304,  335,  891,  335,  335,
--      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
--
--      335,  335,  335,  335,  338,  890,  889,  338,  338,  338,
--      338,  338,  338,  338,  338,  338,  338,  338,  338,  338,
--      341,  888,  341,  341,  341,  341,  341,  341,  341,  341,
--      341,  341,  341,  341,  341,  341,  341,  341,  342,  887,
--      342,  342,  342,  342,  342,  342,  342,  342,  342,  342,
--      342,  342,  342,  342,  342,  342,  350,  350,  886,  885,
--      350,  350,  350,  352,  352,  884,  883,  352,  352,  352,
--      353,  353,  353,  353,  353,  353,  353,  353,  353,  353,
--      353,  353,  353,  353,  353,  353,  353,  353,  212,  212,
--      212,  212,  882,  879,  212,  212,  212,  357,  357,  357,
-+      243,  243,  243,  243,  243,  243,  243,  243,  243,  244,
-+      947,  244,  244,  244,  244,  244,  244,  244,  244,  244,
-+      244,  244,  244,  244,  244,  244,  244,  244,  248,  248,
-+      248,  248,  248,  248,  248,  248,  248,  248,  248,  248,
-+      248,  248,  248,  248,  248,  248,  248,  250,  946,  250,
-+      250,  250,  945,  250,  250,  250,  944,  943,  250,  250,
-+      250,  942,  941,  940,  250,  250,  252,  252,  252,  252,
-+      939,  938,  937,  252,  252,  252,  256,  936,  935,  256,
-+      256,  256,  256,  256,  256,  256,  256,  256,  256,  256,
-+      256,  256,  256,  256,  256,  264,  264,  264,  264,  934,
-+
-+      933,  932,  264,  264,  264,  269,  931,  269,  269,  269,
-+      269,  269,  269,  269,  269,  269,  269,  269,  269,  269,
-+      269,  269,  269,  269,  272,  930,  272,  272,  272,  272,
-+      272,  272,  272,  272,  272,  272,  272,  929,  272,  272,
-+      272,  272,  272,  273,  928,  273,  927,  926,  273,  273,
-+      273,  273,  925,  924,  273,  273,  273,  275,  923,  275,
-+      275,  275,  275,  275,  275,  275,  275,  275,  275,  275,
-+      275,  275,  275,  275,  275,  275,  279,  279,  279,  279,
-+      922,  921,  920,  279,  279,  279,  282,  282,  282,  282,
-+      282,  282,  282,  282,  282,  282,  282,  282,  282,  282,
-+
-+      282,  282,  282,  282,  282,  285,  285,  285,  285,  285,
-+      919,  285,  285,  285,  285,  285,  918,  285,  917,  285,
-+      285,  285,  285,  285,  291,  916,  291,  915,  291,  291,
-+      291,  291,  291,  291,  291,  291,  914,  291,  291,  291,
-+      291,  291,  291,  293,  913,  293,  293,  293,  293,  293,
-+      293,  293,  293,  293,  293,  293,  293,  293,  293,  293,
-+      293,  293,  294,  912,  294,  294,  294,  911,  294,  294,
-+      294,  910,  909,  294,  294,  294,  908,  907,  906,  294,
-+      294,  299,  299,  299,  299,  905,  904,  903,  299,  299,
-+      299,  304,  902,  304,  304,  304,  304,  304,  304,  304,
-+
-+      304,  304,  304,  304,  304,  304,  304,  304,  304,  304,
-+      308,  308,  901,  308,  308,  900,  899,  898,  897,  308,
-+      308,  339,  896,  339,  339,  339,  339,  339,  339,  339,
-+      339,  339,  339,  339,  339,  339,  339,  339,  339,  339,
-+      342,  895,  894,  342,  342,  342,  342,  342,  342,  342,
-+      342,  342,  342,  342,  342,  342,  342,  345,  893,  345,
-+      345,  345,  345,  345,  345,  345,  345,  345,  345,  345,
-+      345,  345,  345,  345,  345,  345,  346,  892,  346,  346,
-+      346,  346,  346,  346,  346,  346,  346,  346,  346,  346,
-+      346,  346,  346,  346,  346,  354,  354,  891,  890,  889,
- 
-+      354,  354,  354,  356,  356,  888,  887,  886,  356,  356,
-+      356,  357,  357,  357,  357,  357,  357,  357,  357,  357,
-       357,  357,  357,  357,  357,  357,  357,  357,  357,  357,
--      357,  357,  357,  357,  357,  361,  878,  361,  361,  361,
--      361,  361,  361,  361,  361,  361,  361,  877,  361,  361,
--      361,  361,  361,  221,  876,  221,  221,  221,  221,  221,
--      221,  221,  221,  221,  221,  221,  221,  221,  221,  221,
--      221,  368,  368,  875,  874,  873,  872,  368,  369,  369,
--      369,  369,  871,  870,  369,  369,  369,  869,  369,  374,
--      868,  374,  374,  374,  374,  374,  374,  374,  374,  374,
--      374,  374,  374,  374,  374,  374,  374,  239,  867,  239,
--      239,  239,  239,  239,  239,  239,  239,  239,  239,  239,
--
--      239,  239,  239,  239,  239,  241,  866,  241,  241,  241,
-+      214,  214,  214,  214,  883,  882,  881,  214,  214,  214,
-+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
-+      361,  361,  361,  361,  361,  361,  361,  361,  361,  365,
-+      880,  365,  365,  365,  365,  365,  365,  365,  365,  365,
-+      365,  365,  879,  365,  365,  365,  365,  365,  223,  878,
-+      223,  223,  223,  223,  223,  223,  223,  223,  223,  223,
-+      223,  223,  223,  223,  223,  223,  223,  372,  372,  877,
-+
-+      876,  875,  874,  873,  372,  373,  373,  373,  373,  872,
-+      871,  870,  373,  373,  373,  869,  373,  378,  868,  378,
-+      378,  378,  378,  378,  378,  378,  378,  378,  378,  378,
-+      378,  378,  378,  378,  378,  378,  241,  867,  241,  241,
-       241,  241,  241,  241,  241,  241,  241,  241,  241,  241,
--      241,  241,  241,  242,  865,  242,  242,  242,  242,  242,
--      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
--      242,  376,  864,  376,  376,  376,  376,  376,  376,  376,
--      376,  376,  376,  376,  376,  376,  376,  376,  376,  377,
--      863,  377,  377,  377,  377,  377,  377,  377,  377,  377,
--      377,  377,  377,  377,  377,  377,  377,  246,  246,  246,
--      246,  246,  246,  246,  246,  246,  246,  246,  246,  246,
--      246,  246,  246,  246,  246,  248,  862,  248,  248,  248,
--
--      861,  248,  248,  248,  860,  859,  248,  248,  858,  857,
--      856,  248,  248,  250,  250,  250,  250,  855,  854,  250,
--      250,  250,  254,  853,  852,  254,  254,  254,  254,  254,
--      254,  254,  254,  254,  254,  254,  254,  254,  254,  254,
--      262,  262,  262,  262,  851,  850,  262,  262,  262,  384,
--      384,  849,  848,  847,  384,  384,  271,  846,  271,  843,
--      842,  271,  271,  271,  271,  841,  840,  271,  271,  273,
--      839,  273,  273,  273,  273,  273,  273,  273,  273,  273,
--      273,  273,  273,  273,  273,  273,  273,  277,  277,  277,
--      277,  838,  837,  277,  277,  277,  280,  280,  280,  280,
--
--      280,  280,  280,  280,  280,  280,  280,  280,  280,  280,
--      280,  280,  280,  280,  283,  283,  283,  283,  283,  836,
--      283,  283,  283,  283,  283,  283,  283,  283,  283,  283,
--      283,  283,  287,  835,  287,  834,  287,  287,  287,  287,
--      287,  287,  287,  833,  287,  287,  287,  287,  287,  287,
--      290,  832,  290,  290,  290,  831,  290,  290,  290,  830,
--      829,  290,  290,  828,  827,  826,  290,  290,  295,  295,
--      295,  295,  825,  824,  295,  295,  295,  300,  823,  300,
--      300,  300,  300,  300,  300,  300,  300,  300,  300,  300,
--      300,  300,  300,  300,  300,  304,  304,  822,  304,  304,
--
--      821,  820,  819,  304,  304,  335,  818,  335,  335,  335,
--      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
--      335,  335,  335,  338,  817,  816,  338,  338,  338,  338,
--      338,  338,  338,  338,  338,  338,  338,  338,  338,  341,
--      815,  341,  341,  341,  341,  341,  341,  341,  341,  341,
--      341,  341,  341,  341,  341,  341,  341,  342,  814,  342,
-+      241,  241,  241,  241,  241,  243,  866,  243,  243,  243,
-+      243,  243,  243,  243,  243,  243,  243,  243,  243,  243,
-+      243,  243,  243,  243,  244,  865,  244,  244,  244,  244,
-+      244,  244,  244,  244,  244,  244,  244,  244,  244,  244,
-+      244,  244,  244,  380,  864,  380,  380,  380,  380,  380,
-+
-+      380,  380,  380,  380,  380,  380,  380,  380,  380,  380,
-+      380,  380,  381,  863,  381,  381,  381,  381,  381,  381,
-+      381,  381,  381,  381,  381,  381,  381,  381,  381,  381,
-+      381,  248,  248,  248,  248,  248,  248,  248,  248,  248,
-+      248,  248,  248,  248,  248,  248,  248,  248,  248,  248,
-+      250,  862,  250,  250,  250,  861,  250,  250,  250,  860,
-+      859,  250,  250,  250,  858,  857,  856,  250,  250,  252,
-+      252,  252,  252,  855,  854,  853,  252,  252,  252,  256,
-+      852,  851,  256,  256,  256,  256,  256,  256,  256,  256,
-+      256,  256,  256,  256,  256,  256,  256,  256,  264,  264,
-+
-+      264,  264,  850,  847,  846,  264,  264,  264,  388,  388,
-+      845,  844,  843,  842,  388,  388,  273,  841,  273,  840,
-+      839,  273,  273,  273,  273,  838,  837,  273,  273,  273,
-+      275,  836,  275,  275,  275,  275,  275,  275,  275,  275,
-+      275,  275,  275,  275,  275,  275,  275,  275,  275,  279,
-+      279,  279,  279,  835,  834,  833,  279,  279,  279,  282,
-+      282,  282,  282,  282,  282,  282,  282,  282,  282,  282,
-+      282,  282,  282,  282,  282,  282,  282,  282,  285,  285,
-+      285,  285,  285,  832,  285,  285,  285,  285,  285,  831,
-+      285,  830,  285,  285,  285,  285,  285,  291,  829,  291,
-+
-+      828,  291,  291,  291,  291,  291,  291,  291,  291,  827,
-+      291,  291,  291,  291,  291,  291,  294,  826,  294,  294,
-+      294,  825,  294,  294,  294,  824,  823,  294,  294,  294,
-+      822,  821,  820,  294,  294,  299,  299,  299,  299,  819,
-+      818,  814,  299,  299,  299,  304,  810,  304,  304,  304,
-+      304,  304,  304,  304,  304,  304,  304,  304,  304,  304,
-+      304,  304,  304,  304,  308,  308,  809,  308,  308,  808,
-+      807,  806,  805,  308,  308,  339,  804,  339,  339,  339,
-+      339,  339,  339,  339,  339,  339,  339,  339,  339,  339,
-+      339,  339,  339,  339,  342,  799,  798,  342,  342,  342,
-+
-       342,  342,  342,  342,  342,  342,  342,  342,  342,  342,
--      342,  342,  342,  342,  342,  450,  450,  450,  450,  450,
--      450,  450,  450,  450,  450,  450,  450,  450,  450,  450,
--      450,  450,  450,  459,  459,  459,  459,  810,  806,  459,
--
--      459,  459,  461,  461,  461,  461,  805,  804,  461,  461,
--      461,  353,  353,  353,  353,  353,  353,  353,  353,  353,
--      353,  353,  353,  353,  353,  353,  353,  353,  353,  357,
-+      342,  345,  797,  345,  345,  345,  345,  345,  345,  345,
-+      345,  345,  345,  345,  345,  345,  345,  345,  345,  345,
-+      346,  796,  346,  346,  346,  346,  346,  346,  346,  346,
-+      346,  346,  346,  346,  346,  346,  346,  346,  346,  454,
-+      454,  454,  454,  454,  454,  454,  454,  454,  454,  454,
-+      454,  454,  454,  454,  454,  454,  454,  454,  463,  463,
-+      463,  463,  795,  794,  793,  463,  463,  463,  465,  465,
-+      465,  465,  790,  789,  788,  465,  465,  465,  357,  357,
-       357,  357,  357,  357,  357,  357,  357,  357,  357,  357,
--      357,  357,  357,  357,  357,  357,  357,  361,  803,  361,
--      361,  361,  361,  361,  361,  361,  361,  361,  361,  802,
--      361,  361,  361,  361,  361,  469,  469,  801,  800,  795,
--      794,  469,  369,  369,  369,  369,  793,  792,  369,  369,
--      369,  791,  369,  374,  790,  374,  374,  374,  374,  374,
--      374,  374,  374,  374,  374,  374,  374,  374,  374,  374,
--
--      374,  376,  789,  376,  376,  376,  376,  376,  376,  376,
--      376,  376,  376,  376,  376,  376,  376,  376,  376,  377,
--      786,  377,  377,  377,  377,  377,  377,  377,  377,  377,
--      377,  377,  377,  377,  377,  377,  377,  250,  250,  250,
--      250,  785,  784,  250,  250,  250,  548,  783,  548,  548,
--      548,  548,  548,  548,  548,  548,  548,  548,  548,  548,
--      548,  548,  548,  548,  695,  695,  695,  695,  695,  695,
--      695,  695,  695,  695,  695,  695,  695,  695,  695,  695,
--      695,  695,  811,  811,  811,  811,  811,  811,  811,  811,
--      811,  811,  811,  811,  811,  811,  811,  811,  811,  811,
--
--      782,  781,  780,  779,  778,  777,  776,  775,  774,  773,
--      772,  771,  769,  768,  767,  766,  765,  764,  763,  762,
--      761,  760,  759,  758,  757,  751,  750,  743,  742,  741,
--      740,  739,  738,  737,  736,  735,  734,  733,  732,  731,
--      730,  729,  728,  727,  726,  725,  724,  723,  722,  721,
--      720,  717,  716,  715,  702,  701,  700,  629,  699,  698,
--      624,  694,  693,  692,  691,  690,  689,  688,  687,  686,
--      685,  684,  683,  682,  681,  680,  679,  678,  677,  676,
--      675,  674,  673,  672,  671,  670,  669,  668,  667,  666,
--      665,  664,  663,  662,  659,  658,  655,  654,  653,  652,
--
--      651,  638,  637,  636,  635,  632,  631,  627,  626,  625,
--      624,  623,  622,  621,  620,  619,  618,  617,  616,  615,
--      614,  613,  610,  609,  608,  607,  606,  605,  604,  603,
--      602,  601,  600,  599,  598,  597,  596,  595,  594,  593,
--      592,  591,  590,  589,  585,  584,  583,  582,  581,  580,
--      579,  578,  577,  576,  575,  562,  561,  560,  559,  558,
--      555,  551,  547,  546,  545,  541,  540,  539,  538,  537,
--      536,  535,  534,  533,  532,  528,  527,  526,  525,  524,
--      521,  520,  519,  518,  517,  516,  515,  514,  513,  512,
--      511,  510,  509,  508,  507,  506,  505,  504,  503,  502,
--
--      501,  500,  499,  498,  497,  496,  495,  494,  493,  492,
--      491,  490,  489,  488,  476,  474,  473,  472,  471,  370,
--      462,  460,  458,  457,  456,  344,  449,  336,  438,  437,
--      434,  428,  425,  424,  423,  422,  421,  420,  417,  416,
--      415,  414,  411,  410,  409,  406,  405,  402,  401,  301,
--      298,  400,  399,  294,  396,  395,  260,  258,  260,  255,
--      379,  378,  247,  243,  375,  373,  372,  371,  230,  370,
--      360,  218,  356,  214,  351,  340,  197,  193,  339,  336,
--      334,  333,  332,  331,  330,  329,  328,  324,  318,  317,
--      316,  313,  312,  303,  302,  301,  299,  298,  297,  296,
--
--      276,  294,  293,  288,  286,  279,  278,  276,  272,  266,
--      269,  266,  265,  263,  261,  258,  260,  256,  255,  253,
--      252,  251,  249,  247,  243,  240,  238,  230,  220,  214,
--      211,  197,  193,  972,   98,   98,   86,   78,   78,   41,
--      972,  972,  972,  972,  972,  972,  972,  972,  972,  972,
--      972,  972,  972,  972,  972,  972,  972,  972,  972,  972,
--      972,  972,  972,  972,  972,  972,  972,  972,  972,  972,
--      972,  972,  972,  972,  972,  972,  972,  972,  972,  972,
--      972,  972,  972,  972,  972,  972,  972,  972,  972,  972,
--      972,  972,  972,  972,  972,  972,  972,  972,  972
- 
-+      357,  357,  357,  357,  357,  357,  357,  361,  361,  361,
-+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
-+      361,  361,  361,  361,  361,  361,  365,  787,  365,  365,
-+      365,  365,  365,  365,  365,  365,  365,  365,  365,  786,
-+      365,  365,  365,  365,  365,  473,  473,  785,  784,  783,
-+      782,  781,  473,  373,  373,  373,  373,  780,  779,  778,
-+      373,  373,  373,  777,  373,  378,  776,  378,  378,  378,
-+      378,  378,  378,  378,  378,  378,  378,  378,  378,  378,
-+      378,  378,  378,  378,  380,  775,  380,  380,  380,  380,
-+      380,  380,  380,  380,  380,  380,  380,  380,  380,  380,
-+
-+      380,  380,  380,  381,  773,  381,  381,  381,  381,  381,
-+      381,  381,  381,  381,  381,  381,  381,  381,  381,  381,
-+      381,  381,  252,  252,  252,  252,  772,  771,  770,  252,
-+      252,  252,  552,  769,  552,  552,  552,  552,  552,  552,
-+      552,  552,  552,  552,  552,  552,  552,  552,  552,  552,
-+      552,  699,  699,  699,  699,  699,  699,  699,  699,  699,
-+      699,  699,  699,  699,  699,  699,  699,  699,  699,  699,
-+      815,  815,  815,  815,  815,  815,  815,  815,  815,  815,
-+      815,  815,  815,  815,  815,  815,  815,  815,  815,  768,
-+      767,  766,  765,  764,  763,  762,  761,  755,  754,  747,
-+
-+      746,  745,  744,  743,  742,  741,  740,  739,  738,  737,
-+      736,  735,  734,  733,  732,  731,  730,  729,  728,  727,
-+      726,  725,  724,  721,  720,  719,  706,  705,  704,  633,
-+      703,  702,  628,  698,  697,  696,  695,  694,  693,  692,
-+      691,  690,  689,  688,  687,  686,  685,  684,  683,  682,
-+      681,  680,  679,  678,  677,  676,  675,  674,  673,  672,
-+      671,  670,  669,  668,  667,  666,  663,  662,  659,  658,
-+      657,  656,  655,  642,  641,  640,  639,  636,  635,  631,
-+      630,  629,  628,  627,  626,  625,  624,  623,  622,  621,
-+      620,  619,  618,  617,  614,  613,  612,  611,  610,  609,
-+
-+      608,  607,  606,  605,  604,  603,  602,  601,  600,  599,
-+      598,  597,  596,  595,  594,  593,  589,  588,  587,  586,
-+      585,  584,  583,  582,  581,  580,  579,  566,  565,  564,
-+      563,  562,  559,  555,  551,  550,  549,  545,  544,  543,
-+      542,  541,  540,  539,  538,  537,  536,  532,  531,  530,
-+      529,  528,  525,  524,  523,  522,  521,  520,  519,  518,
-+      517,  516,  515,  514,  513,  512,  511,  510,  509,  508,
-+      507,  506,  505,  504,  503,  502,  501,  500,  499,  498,
-+      497,  496,  495,  494,  493,  492,  480,  478,  477,  476,
-+      475,  374,  466,  464,  462,  461,  460,  348,  453,  340,
-+
-+      442,  441,  438,  432,  429,  428,  427,  426,  425,  424,
-+      421,  420,  419,  418,  415,  414,  413,  410,  409,  406,
-+      405,  305,  302,  404,  403,  298,  400,  399,  262,  260,
-+      262,  257,  383,  382,  249,  245,  379,  377,  376,  375,
-+      232,  374,  364,  220,  360,  216,  355,  344,  199,  195,
-+      343,  340,  338,  337,  336,  335,  334,  333,  332,  328,
-+      322,  321,  320,  317,  316,  307,  306,  305,  303,  302,
-+      301,  300,  278,  298,  297,  292,  290,  289,  288,  281,
-+      280,  278,  274,  268,  271,  268,  267,  265,  263,  260,
-+      262,  258,  257,  255,  254,  253,  251,  249,  245,  242,
-+
-+      240,  232,  222,  216,  213,  199,  195,  976,   98,   98,
-+       86,   78,   78,   41,  976,  976,  976,  976,  976,  976,
-+      976,  976,  976,  976,  976,  976,  976,  976,  976,  976,
-+      976,  976,  976,  976,  976,  976,  976,  976,  976,  976,
-+      976,  976,  976,  976,  976,  976,  976,  976,  976,  976,
-+      976,  976,  976,  976,  976,  976,  976,  976,  976,  976,
-+      976,  976,  976,  976,  976,  976,  976,  976,  976,  976,
-+      976,  976,  976
-     } ;
- 
--static yyconst flex_int16_t yy_chk[3300] =
-+static yyconst flex_int16_t yy_chk[3374] =
-     {   0,
-         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-@@ -1137,19 +1147,19 @@
- 
-         2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
-         2,    2,    2,    2,    2,    2,    2,    2,    3,    3,
--      569,    3,    3,    5,    3,    5,   21,    3,    3,    3,
--        6,    6,    3,    6,   27,  569,   27,    6,    3,   11,
--       11,  392,   11,    3,    3,   12,   12,   17,   12,   17,
-+      949,    3,    3,    5,    3,    5,   21,    3,    3,    3,
-+        6,    6,    3,    6,   27,  437,   27,    6,    3,   11,
-+       11,  437,   11,    3,    3,   12,   12,   17,   12,   17,
-        21,   21,   50,   21,   18,   28,   18,   28,   17,   62,
--       62,   17,   17,   17,   17,   18,  125,  392,   18,   18,
--       18,   18,  949,    3,    3,    3,    4,    4,  173,    4,
--        4,   22,    4,    4,  125,    4,    4,    4,  173,   19,
--        4,   19,   19,   50,  273,   20,    4,   20,   20,  221,
--
--      221,    4,    4,   17,    4,   22,   22,   29,   22,   29,
--       18,  113,  273,   30,   19,   30,   29,  581,   43,   43,
--       20,   43,   30,   47,   47,  113,   47,   59,   59,  581,
--       59,    4,    4,    4,    9,    9,    9,    9,    9,    9,
-+       62,   17,   17,   17,   17,   18,  125,   68,   18,   18,
-+       18,   18,  950,    3,    3,    3,    4,    4,  175,    4,
-+        4,   22,    4,    4,  125,    4,    4,    4,  175,   19,
-+        4,   19,   19,   50,  312,   20,    4,   20,   20,  275,
-+
-+      147,    4,    4,   17,    4,   22,   22,  147,   22,   37,
-+       18,  312,   37,   38,   19,   68,   38,  275,   43,   43,
-+       20,   43,  953,   37,   37,   37,   37,   38,   38,   38,
-+       38,    4,    4,    4,    9,    9,    9,    9,    9,    9,
-         9,    9,    9,    9,    9,    9,    9,    9,    9,    9,
-         9,    9,    9,    9,    9,    9,    9,    9,    9,    9,
-         9,    9,    9,    9,    9,    9,    9,    9,    9,    9,
-@@ -1162,9 +1172,9 @@
-        13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
-        13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
-        13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
--       13,   13,   23,  736,   23,   24,   37,   24,  145,   37,
--       64,   64,   64,   64,   23,  145,   76,   24,   76,  736,
--       37,   37,   37,   37,  225,  225,   23,   23,   23,   24,
-+       13,   13,   23,  575,   23,   24,  174,   24,   47,   47,
-+      174,   47,   59,   59,   23,   59,  575,   24,   64,   64,
-+       64,   64,   76,  132,   76,  132,   23,   23,   23,   24,
-        24,   24,   25,   25,   25,   25,   25,   25,   25,   25,
-        25,   25,   25,   25,   25,   25,   25,   25,   25,   25,
- 
-@@ -1172,321 +1182,329 @@
-        25,   25,   25,   25,   25,   25,   25,   25,   25,   25,
-        25,   25,   25,   25,   25,   25,   25,   25,   25,   25,
-        25,   25,   25,   25,   25,   25,   25,   25,   25,   25,
--       25,   31,  951,   31,   31,   32,   38,   32,   32,   38,
--       92,   92,  222,   92,  103,  103,  103,  103,  222,  222,
--       38,   38,   38,   38,  172,  132,   31,  132,  172,  952,
--       32,   33,   33,   33,   33,   33,   33,   33,   33,   33,
-+       25,   29,   30,   29,   30,   31,  295,   31,   31,  573,
-+       29,   30,   32,  295,   32,   32,   92,   92,  113,   92,
-+      103,  103,  103,  103,  573,   29,   30,   29,   30,  134,
-+       31,  134,  113,  135,  137,  135,  137,   32,   33,   33,
-        33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
-        33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
- 
-        33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
-        33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
-        33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
-+       33,   33,   33,   33,   33,   33,   33,   35,   35,   35,
-        35,   35,   35,   35,   35,   35,   35,   35,   35,   35,
-        35,   35,   35,   35,   35,   35,   35,   35,   35,   35,
-        35,   35,   35,   35,   35,   35,   35,   35,   35,   35,
-        35,   35,   35,   35,   35,   35,   35,   35,   35,   35,
-        35,   35,   35,   35,   35,   35,   35,   35,   35,   35,
--       35,   35,   35,   35,   35,   35,   35,   35,   35,   39,
--       40,   39,   40,   55,   55,  953,   55,   63,   63,  167,
-+       35,   35,   35,   35,   35,   35,   39,   40,   39,   40,
- 
--       55,   65,   65,   68,   65,  134,  163,  134,   65,  164,
--      109,  109,  112,  112,  163,   65,  119,  119,  135,  167,
--      135,   65,  137,  175,  137,  162,  199,  162,  164,   65,
--      210,  162,  210,  175,  954,   63,  175,  186,  186,  186,
--      186,  223,  223,   39,   40,   39,   40,   51,  109,   55,
--      112,   68,  192,  192,  119,  192,  308,   65,  196,  196,
--      217,  196,  217,  257,  257,  390,  257,  199,  213,  213,
--       51,  213,   51,  308,   51,  213,  280,  312,  280,  223,
--       51,  312,  317,   51,   51,   51,  317,   51,   51,   51,
--      390,  203,  203,   51,  203,   51,  204,  204,  291,  204,
--
--      205,  205,  282,  205,  282,  291,  203,  203,  203,  203,
--      955,  204,  204,  204,  204,  205,  205,  205,  205,  206,
--      206,  283,  206,  283,  213,  305,  229,  229,  285,  229,
--      285,  361,  361,  229,  206,  206,  206,  206,  203,  305,
--      229,  264,  264,  264,  264,  205,  229,  326,  329,  328,
--      478,  329,  331,  328,  229,  367,  367,  326,  328,  331,
--      353,  478,  353,  206,  337,  337,  337,  337,  355,  357,
--      355,  357,  359,  362,  359,  370,  370,  370,  370,  362,
--      362,  956,  229,  253,  253,  253,  253,  253,  253,  253,
--      253,  253,  253,  253,  253,  253,  253,  253,  253,  253,
--
--      253,  253,  253,  253,  253,  253,  253,  253,  253,  253,
--      253,  253,  253,  253,  253,  253,  253,  253,  253,  253,
--      253,  253,  253,  253,  253,  253,  253,  253,  253,  253,
--      253,  253,  253,  253,  253,  253,  253,  253,  253,  253,
--      253,  253,  266,  266,  266,  266,  385,  394,  266,  433,
--      450,  957,  450,  266,  453,  433,  453,  266,  529,  844,
--      266,  394,  266,  844,  529,  266,  294,  294,  385,  294,
--      294,  294,  294,  294,  294,  294,  294,  294,  294,  294,
--      294,  294,  294,  294,  294,  294,  294,  294,  294,  294,
--      294,  294,  294,  294,  294,  294,  294,  294,  294,  294,
--
--      294,  294,  294,  294,  294,  294,  294,  294,  294,  294,
--      294,  294,  294,  294,  294,  294,  294,  294,  294,  294,
--      294,  294,  294,  294,  294,  334,  334,  387,  334,  363,
--      363,  334,  334,  388,  393,  479,  386,  334,  334,  343,
--      343,  363,  343,  334,  334,  641,  346,  346,  334,  346,
--      960,  387,  388,  480,  343,  343,  343,  343,  386,  961,
--      393,  346,  346,  346,  346,  479,  641,  363,  364,  364,
--      480,  364,  364,  364,  364,  364,  364,  364,  364,  364,
--      364,  364,  364,  364,  364,  364,  364,  364,  364,  364,
--      364,  364,  364,  364,  364,  364,  460,  364,  364,  364,
--
--      364,  364,  364,  364,  364,  364,  364,  364,  364,  364,
--      364,  364,  364,  364,  364,  364,  364,  364,  364,  364,
--      364,  364,  364,  364,  364,  364,  364,  365,  365,  439,
--      556,  556,  439,  439,  481,  557,  557,  365,  365,  366,
--      366,  366,  366,  455,  455,  481,  455,  366,  964,  366,
--      366,  460,  633,  633,  366,  366,  366,  366,  366,  366,
--      380,  380,  380,  380,  380,  380,  380,  380,  380,  380,
--      380,  380,  380,  380,  380,  380,  380,  380,  380,  380,
--      380,  380,  380,  380,  380,  380,  380,  380,  380,  380,
--      380,  380,  380,  380,  380,  380,  380,  380,  380,  380,
-+       55,   55,  166,   55,   63,   63,  165,   55,   65,   65,
-+      164,   65,  164,  169,  165,   65,  164,  109,  109,  112,
-+      112,  166,   65,  119,  119,  177,  201,  335,   65,  188,
-+      188,  188,  188,  169,  335,  177,   65,  212,  177,  212,
-+      194,  194,   63,  194,  198,  198,  219,  198,  219,  955,
-+       39,   40,   39,   40,   51,  109,   55,  112,  223,  223,
-+      309,  119,  227,  227,   65,  643,  224,  201,  205,  205,
-+      330,  205,  224,  224,  309,  215,  215,   51,  215,   51,
-+      330,   51,  215,  205,  205,  205,  205,   51,  643,  316,
-+       51,   51,   51,  316,   51,   51,   51,  225,  225,  282,
-+
-+       51,  282,   51,  206,  206,  321,  206,  207,  207,  321,
-+      207,  208,  208,  333,  208,  205,  333,  956,  206,  206,
-+      206,  206,  207,  207,  207,  207,  208,  208,  208,  208,
-+      284,  215,  284,  231,  231,  225,  231,  957,  259,  259,
-+      231,  259,  266,  266,  266,  266,  285,  231,  285,  287,
-+      332,  287,  207,  231,  332,  208,  391,  347,  347,  332,
-+      347,  231,  341,  341,  341,  341,  350,  350,  357,  350,
-+      357,  958,  347,  347,  347,  347,  359,  361,  359,  361,
-+      391,  350,  350,  350,  350,  363,  454,  363,  454,  231,
-+      255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
-+
-+      255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
-+      255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
-+      255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
-+      255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
-+      255,  255,  255,  255,  255,  255,  255,  255,  255,  268,
-+      268,  268,  268,  365,  365,  268,  366,  371,  371,  482,
-+      268,  398,  366,  366,  268,  533,  457,  268,  457,  268,
-+      482,  533,  268,  298,  298,  398,  298,  298,  298,  298,
-+      298,  298,  298,  298,  298,  298,  298,  298,  298,  298,
-+      298,  298,  298,  298,  298,  298,  298,  298,  298,  298,
-+
-+      298,  298,  298,  298,  298,  298,  298,  298,  298,  298,
-+      298,  298,  298,  298,  298,  298,  298,  298,  298,  298,
-+      298,  298,  298,  298,  298,  298,  298,  298,  298,  298,
-+      298,  298,  338,  338,  396,  338,  367,  367,  338,  338,
-+      389,  390,  369,  369,  338,  338,  392,  394,  367,  393,
-+      338,  338,  369,  369,  577,  338,  374,  374,  374,  374,
-+      396,  959,  389,  390,  443,  392,  960,  443,  443,  577,
-+      459,  459,  394,  459,  367,  368,  368,  393,  368,  368,
-+      368,  368,  368,  368,  368,  368,  368,  368,  368,  368,
-+      368,  368,  368,  368,  368,  368,  368,  368,  368,  368,
-+
-+      368,  368,  368,  961,  368,  368,  368,  368,  368,  368,
-+      368,  368,  368,  368,  368,  368,  368,  368,  368,  368,
-+      368,  368,  368,  368,  368,  368,  368,  368,  368,  368,
-+      368,  368,  368,  368,  370,  370,  370,  370,  547,  629,
-+      547,  629,  370,  964,  370,  370,  559,  559,  559,  370,
-+      370,  370,  370,  370,  370,  384,  384,  384,  384,  384,
-+      384,  384,  384,  384,  384,  384,  384,  384,  384,  384,
-+      384,  384,  384,  384,  384,  384,  384,  384,  384,  384,
-+      384,  384,  384,  384,  384,  384,  384,  384,  384,  384,
-+      384,  384,  384,  384,  384,  384,  384,  384,  384,  384,
-+
-+      384,  384,  384,  384,  384,  384,  384,  384,  384,  384,
-+      384,  384,  384,  384,  387,  387,  395,  387,  387,  387,
-+      387,  387,  387,  387,  387,  397,  387,  387,  387,  387,
-+      387,  387,  387,  387,  387,  387,  387,  387,  484,  965,
-+      387,  387,  387,  387,  395,  455,  455,  395,  455,  458,
-+      458,  397,  458,  464,  483,  484,  487,  553,  468,  468,
-+      455,  455,  455,  455,  458,  458,  458,  458,  468,  468,
-+      387,  387,  387,  402,  402,  487,  402,  402,  402,  402,
-+      402,  402,  402,  402,  483,  402,  402,  402,  402,  402,
-+      402,  402,  402,  402,  402,  402,  402,  481,  485,  402,
-+
-+      402,  402,  402,  471,  471,  486,  489,  491,  464,  485,
-+      488,  490,  553,  471,  471,  548,  548,  489,  548,  554,
-+      554,  481,  554,  481,  560,  560,  491,  561,  561,  402,
-+      402,  402,  467,  467,  488,  637,  637,  490,  486,  467,
-+      467,  467,  467,  467,  467,  467,  467,  467,  467,  467,
-+      467,  467,  467,  467,  467,  467,  467,  467,  467,  467,
-+      467,  467,  467,  467,  469,  469,  469,  469,  505,  572,
-+      569,  568,  469,  571,  968,  567,  636,  636,  636,  469,
-+      469,  469,  469,  469,  469,  472,  472,  472,  472,  568,
-+      505,  570,  571,  472,  569,  572,  505,  557,  557,  574,
-+
-+      472,  472,  472,  472,  472,  472,  567,  557,  557,  558,
-+      558,  558,  558,  578,  638,  638,  646,  558,  576,  570,
-+      585,  645,  647,  574,  558,  558,  558,  558,  558,  558,
-+      578,  576,  585,  590,  632,  632,  644,  632,  646,  648,
-+      649,  650,  645,  590,  651,  652,  654,  644,  653,  663,
-+      693,  693,  647,  718,  699,  693,  699,  648,  693,  663,
-+      652,  693,  697,  697,  740,  654,  693,  697,  649,  969,
-+      697,  650,  795,  697,  651,  701,  653,  701,  751,  970,
-+      740,  759,  751,  718,  759,  751,  761,  972,  761,  795,
-+      815,  817,  815,  817,  759,  751,  848,  973, 1019, 1019,
- 
--      380,  380,  380,  380,  380,  380,  380,  380,  380,  380,
--      380,  380,  380,  380,  380,  380,  380,  380,  380,  383,
--      383,  389,  383,  383,  383,  383,  383,  383,  383,  383,
--      391,  383,  383,  383,  383,  383,  383,  383,  383,  383,
--      383,  383,  383,  483,  573,  383,  383,  383,  383,  389,
--      451,  451,  965,  451,  454,  454,  482,  454,  391,  573,
--      966,  391,  483,  464,  464,  451,  451,  451,  451,  454,
--      454,  454,  454,  464,  464,  383,  383,  383,  398,  398,
--      563,  398,  398,  398,  398,  398,  398,  398,  398,  482,
--      398,  398,  398,  398,  398,  398,  398,  398,  398,  398,
--
--      398,  398,  467,  467,  398,  398,  398,  398,  484,  485,
--      487,  563,  467,  467,  486,  477,  543,  568,  543,  549,
--      485,  544,  544,  567,  544,  550,  550,  968,  550,  487,
--      969,  625,  484,  625,  398,  398,  398,  463,  463,  477,
--      486,  477,  567,  568,  463,  463,  463,  463,  463,  463,
--      463,  463,  463,  463,  463,  463,  463,  463,  463,  463,
--      463,  463,  463,  463,  463,  463,  463,  463,  463,  465,
--      465,  465,  465,  501,  549,  565,  564,  465,  555,  555,
--      555,  634,  634,  566,  465,  465,  465,  465,  465,  465,
--      468,  468,  468,  468,  564,  501,  570,  946,  468,  565,
--
--      945,  501,  553,  553,  574,  468,  468,  468,  468,  468,
--      468,  566,  553,  553,  554,  554,  554,  554,  586,  639,
--      570,  574,  554,  571,  572,  632,  632,  632,  586,  554,
--      554,  554,  554,  554,  554,  640,  571,  572,  628,  628,
--      642,  628,  639,  643,  645,  644,  640,  646,  647,  648,
--      650,  649,  695,  791,  695,  659,  697,  714,  697,  757,
--      944,  757,  642,  644,  648,  659, 1015, 1015,  755,  650,
--      791,  755,  645,  643,  943,  689,  689,  646,  647,  649,
--      689,  755,  942,  689,  693,  693,  689,  714,  941,  693,
--      747,  689,  693,  940,  747,  693,  811,  747,  811,  813,
--
--      936,  813,  935,  934,  933,  931,  929,  747,  973,  973,
--      973,  973,  973,  973,  973,  973,  973,  973,  973,  973,
--      973,  973,  973,  973,  973,  973,  974,  974,  974,  974,
--      974,  974,  974,  974,  974,  974,  974,  974,  974,  974,
--      974,  974,  974,  974,  975,  975,  975,  975,  975,  975,
--      975,  975,  975,  975,  975,  975,  975,  975,  975,  975,
--      975,  975,  976,  976,  976,  976,  976,  976,  976,  976,
--      976,  976,  976,  976,  976,  976,  976,  976,  976,  976,
-+      848,  977,  977,  977,  977,  977,  977,  977,  977,  977,
-       977,  977,  977,  977,  977,  977,  977,  977,  977,  977,
--      977,  977,  977,  977,  977,  977,  977,  977,  978,  978,
--
-       978,  978,  978,  978,  978,  978,  978,  978,  978,  978,
--      978,  978,  978,  978,  978,  978,  979,  979,  979,  979,
-+      978,  978,  978,  978,  978,  978,  978,  978,  978,  979,
-       979,  979,  979,  979,  979,  979,  979,  979,  979,  979,
--      979,  979,  979,  979,  980,  980,  980,  980,  980,  980,
-+      979,  979,  979,  979,  979,  979,  979,  979,  980,  980,
-       980,  980,  980,  980,  980,  980,  980,  980,  980,  980,
--      980,  980,  981,  981,  981,  981,  981,  981,  981,  981,
-+      980,  980,  980,  980,  980,  980,  980,  981,  981,  981,
-       981,  981,  981,  981,  981,  981,  981,  981,  981,  981,
-+      981,  981,  981,  981,  981,  981,  982,  982,  982,  982,
-+
-       982,  982,  982,  982,  982,  982,  982,  982,  982,  982,
--      982,  982,  982,  982,  982,  982,  982,  982,  983,  983,
-+      982,  982,  982,  982,  982,  983,  983,  983,  983,  983,
-       983,  983,  983,  983,  983,  983,  983,  983,  983,  983,
--
--      983,  983,  983,  983,  983,  983,  984,  984,  984,  984,
-+      983,  983,  983,  983,  984,  984,  984,  984,  984,  984,
-       984,  984,  984,  984,  984,  984,  984,  984,  984,  984,
--      984,  984,  984,  984,  985,  985,  985,  985,  985,  985,
-+      984,  984,  984,  985,  985,  985,  985,  985,  985,  985,
-       985,  985,  985,  985,  985,  985,  985,  985,  985,  985,
-       985,  985,  986,  986,  986,  986,  986,  986,  986,  986,
-       986,  986,  986,  986,  986,  986,  986,  986,  986,  986,
-+      986,  987,  987,  987,  987,  987,  987,  987,  987,  987,
-+
-       987,  987,  987,  987,  987,  987,  987,  987,  987,  987,
--      987,  987,  987,  987,  987,  987,  987,  987,  988,  988,
--      988,  988,  928,  927,  988,  988,  988,  989,  989,  989,
-+      988,  988,  988,  988,  988,  988,  988,  988,  988,  988,
-+      988,  988,  988,  988,  988,  988,  988,  988,  988,  989,
-       989,  989,  989,  989,  989,  989,  989,  989,  989,  989,
--
--      989,  989,  989,  989,  990,  990,  990,  990,  926,  924,
--      990,  990,  990,  991,  923,  991,  991,  991,  991,  991,
-+      989,  989,  989,  989,  989,  989,  989,  989,  990,  990,
-+      990,  990,  990,  990,  990,  990,  990,  990,  990,  990,
-+      990,  990,  990,  990,  990,  990,  990,  991,  991,  991,
-       991,  991,  991,  991,  991,  991,  991,  991,  991,  991,
--      991,  992,  922,  992,  992,  992,  992,  992,  992,  992,
--      992,  992,  992,  992,  992,  992,  992,  992,  992,  993,
--      993,  993,  921,  918,  993,  993,  993,  994,  915,  994,
--      994,  994,  994,  994,  994,  994,  994,  994,  994,  994,
--      994,  994,  994,  994,  994,  995,  914,  995,  995,  995,
--      995,  995,  995,  995,  995,  995,  995,  995,  995,  995,
--      995,  995,  995,  996,  913,  996,  996,  996,  996,  996,
-+      991,  991,  991,  991,  991,  991,  992,  992,  992,  992,
-+      948,  947,  946,  992,  992,  992,  993,  993,  993,  993,
- 
-+      993,  993,  993,  993,  993,  993,  993,  993,  993,  993,
-+      993,  993,  993,  993,  994,  994,  994,  994,  945,  944,
-+      940,  994,  994,  994,  995,  939,  995,  995,  995,  995,
-+      995,  995,  995,  995,  995,  995,  995,  995,  995,  995,
-+      995,  995,  995,  996,  938,  996,  996,  996,  996,  996,
-       996,  996,  996,  996,  996,  996,  996,  996,  996,  996,
--      996,  997,  997,  997,  997,  997,  997,  997,  997,  997,
--      997,  997,  997,  997,  997,  997,  997,  997,  997,  998,
--      912,  998,  998,  998,  911,  998,  998,  998,  910,  909,
--      998,  998,  907,  905,  902,  998,  998,  999,  999,  999,
--      999,  901,  900,  999,  999,  999, 1000,  899,  898, 1000,
--     1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000,
--     1000, 1000, 1000, 1000, 1001, 1001, 1001, 1001,  897,  896,
--     1001, 1001, 1001, 1002,  893, 1002, 1002, 1002, 1002, 1002,
--     1002, 1002, 1002, 1002, 1002, 1002, 1002, 1002, 1002, 1002,
--
--     1002, 1003,  892, 1003, 1003, 1003, 1003, 1003, 1003, 1003,
--     1003, 1003, 1003,  891, 1003, 1003, 1003, 1003, 1003, 1004,
--      887, 1004,  885,  884, 1004, 1004, 1004, 1004,  883,  882,
--     1004, 1004, 1005,  881, 1005, 1005, 1005, 1005, 1005, 1005,
--     1005, 1005, 1005, 1005, 1005, 1005, 1005, 1005, 1005, 1005,
--     1006, 1006, 1006, 1006,  880,  879, 1006, 1006, 1006, 1007,
--     1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
--     1007, 1007, 1007, 1007, 1007, 1007, 1007, 1008, 1008, 1008,
--     1008, 1008,  878, 1008, 1008, 1008, 1008, 1008, 1008, 1008,
--     1008, 1008, 1008, 1008, 1008, 1009,  877, 1009,  876, 1009,
--
--     1009, 1009, 1009, 1009, 1009, 1009,  875, 1009, 1009, 1009,
--     1009, 1009, 1009, 1010,  874, 1010, 1010, 1010, 1010, 1010,
--     1010, 1010, 1010, 1010, 1010, 1010, 1010, 1010, 1010, 1010,
--     1010, 1011,  873, 1011, 1011, 1011,  871, 1011, 1011, 1011,
--      870,  869, 1011, 1011,  868,  867,  866, 1011, 1011, 1012,
--     1012, 1012, 1012,  865,  864, 1012, 1012, 1012, 1013,  863,
--     1013, 1013, 1013, 1013, 1013, 1013, 1013, 1013, 1013, 1013,
--     1013, 1013, 1013, 1013, 1013, 1013, 1014, 1014,  860, 1014,
--     1014,  859,  858,  857, 1014, 1014, 1016,  856, 1016, 1016,
--     1016, 1016, 1016, 1016, 1016, 1016, 1016, 1016, 1016, 1016,
-+      996,  996,  997,  997,  997,  937,  935,  933,  997,  997,
-+      997,  998,  932,  998,  998,  998,  998,  998,  998,  998,
-+      998,  998,  998,  998,  998,  998,  998,  998,  998,  998,
-+      999,  931,  999,  999,  999,  999,  999,  999,  999,  999,
-+
-+      999,  999,  999,  999,  999,  999,  999,  999,  999, 1000,
-+      930, 1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000,
-+     1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000, 1001, 1001,
-+     1001, 1001, 1001, 1001, 1001, 1001, 1001, 1001, 1001, 1001,
-+     1001, 1001, 1001, 1001, 1001, 1001, 1001, 1002,  928, 1002,
-+     1002, 1002,  927, 1002, 1002, 1002,  926,  925, 1002, 1002,
-+     1002,  922,  919,  918, 1002, 1002, 1003, 1003, 1003, 1003,
-+      917,  916,  915, 1003, 1003, 1003, 1004,  914,  913, 1004,
-+     1004, 1004, 1004, 1004, 1004, 1004, 1004, 1004, 1004, 1004,
-+     1004, 1004, 1004, 1004, 1004, 1005, 1005, 1005, 1005,  911,
-+
-+      909,  906, 1005, 1005, 1005, 1006,  905, 1006, 1006, 1006,
-+     1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006,
-+     1006, 1006, 1006, 1006, 1007,  904, 1007, 1007, 1007, 1007,
-+     1007, 1007, 1007, 1007, 1007, 1007, 1007,  903, 1007, 1007,
-+     1007, 1007, 1007, 1008,  902, 1008,  901,  900, 1008, 1008,
-+     1008, 1008,  897,  896, 1008, 1008, 1008, 1009,  895, 1009,
-+     1009, 1009, 1009, 1009, 1009, 1009, 1009, 1009, 1009, 1009,
-+     1009, 1009, 1009, 1009, 1009, 1009, 1010, 1010, 1010, 1010,
-+      891,  889,  888, 1010, 1010, 1010, 1011, 1011, 1011, 1011,
-+     1011, 1011, 1011, 1011, 1011, 1011, 1011, 1011, 1011, 1011,
-+
-+     1011, 1011, 1011, 1011, 1011, 1012, 1012, 1012, 1012, 1012,
-+      887, 1012, 1012, 1012, 1012, 1012,  886, 1012,  885, 1012,
-+     1012, 1012, 1012, 1012, 1013,  884, 1013,  883, 1013, 1013,
-+     1013, 1013, 1013, 1013, 1013, 1013,  882, 1013, 1013, 1013,
-+     1013, 1013, 1013, 1014,  881, 1014, 1014, 1014, 1014, 1014,
-+     1014, 1014, 1014, 1014, 1014, 1014, 1014, 1014, 1014, 1014,
-+     1014, 1014, 1015,  880, 1015, 1015, 1015,  879, 1015, 1015,
-+     1015,  878,  877, 1015, 1015, 1015,  875,  874,  873, 1015,
-+     1015, 1016, 1016, 1016, 1016,  872,  871,  870, 1016, 1016,
-+     1016, 1017,  869, 1017, 1017, 1017, 1017, 1017, 1017, 1017,
- 
--     1016, 1016, 1016, 1016, 1017,  854,  852, 1017, 1017, 1017,
-      1017, 1017, 1017, 1017, 1017, 1017, 1017, 1017, 1017, 1017,
--     1018,  851, 1018, 1018, 1018, 1018, 1018, 1018, 1018, 1018,
--     1018, 1018, 1018, 1018, 1018, 1018, 1018, 1018, 1019,  850,
--     1019, 1019, 1019, 1019, 1019, 1019, 1019, 1019, 1019, 1019,
--     1019, 1019, 1019, 1019, 1019, 1019, 1020, 1020,  849,  848,
--     1020, 1020, 1020, 1021, 1021,  847,  846, 1021, 1021, 1021,
-+     1018, 1018,  868, 1018, 1018,  867,  864,  863,  862, 1018,
-+     1018, 1020,  861, 1020, 1020, 1020, 1020, 1020, 1020, 1020,
-+     1020, 1020, 1020, 1020, 1020, 1020, 1020, 1020, 1020, 1020,
-+     1021,  860,  858, 1021, 1021, 1021, 1021, 1021, 1021, 1021,
-+     1021, 1021, 1021, 1021, 1021, 1021, 1021, 1022,  856, 1022,
-      1022, 1022, 1022, 1022, 1022, 1022, 1022, 1022, 1022, 1022,
--     1022, 1022, 1022, 1022, 1022, 1022, 1022, 1022, 1023, 1023,
--     1023, 1023,  845,  843, 1023, 1023, 1023, 1024, 1024, 1024,
-+     1022, 1022, 1022, 1022, 1022, 1022, 1023,  855, 1023, 1023,
-+     1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023,
-+     1023, 1023, 1023, 1023, 1023, 1024, 1024,  854,  853,  852,
- 
--     1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024,
--     1024, 1024, 1024, 1024, 1024, 1025,  842, 1025, 1025, 1025,
--     1025, 1025, 1025, 1025, 1025, 1025, 1025,  841, 1025, 1025,
--     1025, 1025, 1025, 1026,  840, 1026, 1026, 1026, 1026, 1026,
-+     1024, 1024, 1024, 1025, 1025,  851,  850,  849, 1025, 1025,
-+     1025, 1026, 1026, 1026, 1026, 1026, 1026, 1026, 1026, 1026,
-      1026, 1026, 1026, 1026, 1026, 1026, 1026, 1026, 1026, 1026,
--     1026, 1027, 1027,  838,  837,  836,  835, 1027, 1028, 1028,
--     1028, 1028,  834,  833, 1028, 1028, 1028,  832, 1028, 1029,
--      831, 1029, 1029, 1029, 1029, 1029, 1029, 1029, 1029, 1029,
--     1029, 1029, 1029, 1029, 1029, 1029, 1029, 1030,  830, 1030,
-+     1027, 1027, 1027, 1027,  847,  846,  845, 1027, 1027, 1027,
-+     1028, 1028, 1028, 1028, 1028, 1028, 1028, 1028, 1028, 1028,
-+     1028, 1028, 1028, 1028, 1028, 1028, 1028, 1028, 1028, 1029,
-+      844, 1029, 1029, 1029, 1029, 1029, 1029, 1029, 1029, 1029,
-+     1029, 1029,  842, 1029, 1029, 1029, 1029, 1029, 1030,  841,
-      1030, 1030, 1030, 1030, 1030, 1030, 1030, 1030, 1030, 1030,
-+     1030, 1030, 1030, 1030, 1030, 1030, 1030, 1031, 1031,  840,
- 
--     1030, 1030, 1030, 1030, 1030, 1031,  829, 1031, 1031, 1031,
--     1031, 1031, 1031, 1031, 1031, 1031, 1031, 1031, 1031, 1031,
--     1031, 1031, 1031, 1032,  828, 1032, 1032, 1032, 1032, 1032,
--     1032, 1032, 1032, 1032, 1032, 1032, 1032, 1032, 1032, 1032,
--     1032, 1033,  827, 1033, 1033, 1033, 1033, 1033, 1033, 1033,
--     1033, 1033, 1033, 1033, 1033, 1033, 1033, 1033, 1033, 1034,
--      826, 1034, 1034, 1034, 1034, 1034, 1034, 1034, 1034, 1034,
--     1034, 1034, 1034, 1034, 1034, 1034, 1034, 1035, 1035, 1035,
-+      839,  838,  837,  836, 1031, 1032, 1032, 1032, 1032,  835,
-+      834,  833, 1032, 1032, 1032,  832, 1032, 1033,  831, 1033,
-+     1033, 1033, 1033, 1033, 1033, 1033, 1033, 1033, 1033, 1033,
-+     1033, 1033, 1033, 1033, 1033, 1033, 1034,  830, 1034, 1034,
-+     1034, 1034, 1034, 1034, 1034, 1034, 1034, 1034, 1034, 1034,
-+     1034, 1034, 1034, 1034, 1034, 1035,  829, 1035, 1035, 1035,
-      1035, 1035, 1035, 1035, 1035, 1035, 1035, 1035, 1035, 1035,
--     1035, 1035, 1035, 1035, 1035, 1036,  825, 1036, 1036, 1036,
-+     1035, 1035, 1035, 1035, 1036,  814, 1036, 1036, 1036, 1036,
-+     1036, 1036, 1036, 1036, 1036, 1036, 1036, 1036, 1036, 1036,
-+     1036, 1036, 1036, 1037,  813, 1037, 1037, 1037, 1037, 1037,
- 
--      810, 1036, 1036, 1036,  809,  808, 1036, 1036,  807,  805,
--      804, 1036, 1036, 1037, 1037, 1037, 1037,  803,  801, 1037,
--     1037, 1037, 1038,  800,  799, 1038, 1038, 1038, 1038, 1038,
-+     1037, 1037, 1037, 1037, 1037, 1037, 1037, 1037, 1037, 1037,
-+     1037, 1037, 1038,  812, 1038, 1038, 1038, 1038, 1038, 1038,
-      1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038,
--     1039, 1039, 1039, 1039,  798,  797, 1039, 1039, 1039, 1040,
--     1040,  796,  794,  793, 1040, 1040, 1041,  792, 1041,  790,
--      789, 1041, 1041, 1041, 1041,  788,  787, 1041, 1041, 1042,
--      786, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042,
--     1042, 1042, 1042, 1042, 1042, 1042, 1042, 1043, 1043, 1043,
--     1043,  785,  784, 1043, 1043, 1043, 1044, 1044, 1044, 1044,
--
--     1044, 1044, 1044, 1044, 1044, 1044, 1044, 1044, 1044, 1044,
--     1044, 1044, 1044, 1044, 1045, 1045, 1045, 1045, 1045,  783,
--     1045, 1045, 1045, 1045, 1045, 1045, 1045, 1045, 1045, 1045,
--     1045, 1045, 1046,  781, 1046,  780, 1046, 1046, 1046, 1046,
--     1046, 1046, 1046,  779, 1046, 1046, 1046, 1046, 1046, 1046,
--     1047,  777, 1047, 1047, 1047,  776, 1047, 1047, 1047,  775,
--      774, 1047, 1047,  773,  772,  771, 1047, 1047, 1048, 1048,
--     1048, 1048,  770,  769, 1048, 1048, 1048, 1049,  768, 1049,
--     1049, 1049, 1049, 1049, 1049, 1049, 1049, 1049, 1049, 1049,
--     1049, 1049, 1049, 1049, 1049, 1050, 1050,  767, 1050, 1050,
--
--      766,  765,  764, 1050, 1050, 1051,  763, 1051, 1051, 1051,
--     1051, 1051, 1051, 1051, 1051, 1051, 1051, 1051, 1051, 1051,
--     1051, 1051, 1051, 1052,  762,  761, 1052, 1052, 1052, 1052,
--     1052, 1052, 1052, 1052, 1052, 1052, 1052, 1052, 1052, 1053,
--      760, 1053, 1053, 1053, 1053, 1053, 1053, 1053, 1053, 1053,
--     1053, 1053, 1053, 1053, 1053, 1053, 1053, 1054,  759, 1054,
--     1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054, 1054,
--     1054, 1054, 1054, 1054, 1054, 1055, 1055, 1055, 1055, 1055,
-+     1038, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039,
-+     1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039,
-+     1040,  811, 1040, 1040, 1040,  809, 1040, 1040, 1040,  808,
-+      807, 1040, 1040, 1040,  805,  804,  803, 1040, 1040, 1041,
-+     1041, 1041, 1041,  802,  801,  800, 1041, 1041, 1041, 1042,
-+      798,  797, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042,
-+     1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1043, 1043,
-+
-+     1043, 1043,  796,  794,  793, 1043, 1043, 1043, 1044, 1044,
-+      792,  791,  790,  789, 1044, 1044, 1045,  788, 1045,  787,
-+      785, 1045, 1045, 1045, 1045,  784,  783, 1045, 1045, 1045,
-+     1046,  781, 1046, 1046, 1046, 1046, 1046, 1046, 1046, 1046,
-+     1046, 1046, 1046, 1046, 1046, 1046, 1046, 1046, 1046, 1047,
-+     1047, 1047, 1047,  780,  779,  778, 1047, 1047, 1047, 1048,
-+     1048, 1048, 1048, 1048, 1048, 1048, 1048, 1048, 1048, 1048,
-+     1048, 1048, 1048, 1048, 1048, 1048, 1048, 1048, 1049, 1049,
-+     1049, 1049, 1049,  777, 1049, 1049, 1049, 1049, 1049,  776,
-+     1049,  775, 1049, 1049, 1049, 1049, 1049, 1050,  774, 1050,
-+
-+      773, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050,  772,
-+     1050, 1050, 1050, 1050, 1050, 1050, 1051,  771, 1051, 1051,
-+     1051,  770, 1051, 1051, 1051,  769,  768, 1051, 1051, 1051,
-+      767,  766,  765, 1051, 1051, 1052, 1052, 1052, 1052,  764,
-+      763,  760, 1052, 1052, 1052, 1053,  758, 1053, 1053, 1053,
-+     1053, 1053, 1053, 1053, 1053, 1053, 1053, 1053, 1053, 1053,
-+     1053, 1053, 1053, 1053, 1054, 1054,  757, 1054, 1054,  756,
-+      755,  754,  753, 1054, 1054, 1055,  752, 1055, 1055, 1055,
-      1055, 1055, 1055, 1055, 1055, 1055, 1055, 1055, 1055, 1055,
--     1055, 1055, 1055, 1056, 1056, 1056, 1056,  756,  754, 1056,
-+     1055, 1055, 1055, 1055, 1056,  750,  749, 1056, 1056, 1056,
- 
--     1056, 1056, 1057, 1057, 1057, 1057,  753,  752, 1057, 1057,
--     1057, 1058, 1058, 1058, 1058, 1058, 1058, 1058, 1058, 1058,
-+     1056, 1056, 1056, 1056, 1056, 1056, 1056, 1056, 1056, 1056,
-+     1056, 1057,  748, 1057, 1057, 1057, 1057, 1057, 1057, 1057,
-+     1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057,
-+     1058,  745, 1058, 1058, 1058, 1058, 1058, 1058, 1058, 1058,
-      1058, 1058, 1058, 1058, 1058, 1058, 1058, 1058, 1058, 1059,
-      1059, 1059, 1059, 1059, 1059, 1059, 1059, 1059, 1059, 1059,
--     1059, 1059, 1059, 1059, 1059, 1059, 1059, 1060,  751, 1060,
--     1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060,  750,
--     1060, 1060, 1060, 1060, 1060, 1061, 1061,  749,  748,  746,
--      745, 1061, 1062, 1062, 1062, 1062,  744,  741, 1062, 1062,
--     1062,  740, 1062, 1063,  739, 1063, 1063, 1063, 1063, 1063,
--     1063, 1063, 1063, 1063, 1063, 1063, 1063, 1063, 1063, 1063,
-+     1059, 1059, 1059, 1059, 1059, 1059, 1059, 1059, 1060, 1060,
-+     1060, 1060,  744,  743,  742, 1060, 1060, 1060, 1061, 1061,
-+     1061, 1061,  738,  737,  735, 1061, 1061, 1061, 1062, 1062,
-+     1062, 1062, 1062, 1062, 1062, 1062, 1062, 1062, 1062, 1062,
- 
--     1063, 1064,  738, 1064, 1064, 1064, 1064, 1064, 1064, 1064,
--     1064, 1064, 1064, 1064, 1064, 1064, 1064, 1064, 1064, 1065,
--      734, 1065, 1065, 1065, 1065, 1065, 1065, 1065, 1065, 1065,
--     1065, 1065, 1065, 1065, 1065, 1065, 1065, 1066, 1066, 1066,
--     1066,  733,  731, 1066, 1066, 1066, 1067,  729, 1067, 1067,
-+     1062, 1062, 1062, 1062, 1062, 1062, 1062, 1063, 1063, 1063,
-+     1063, 1063, 1063, 1063, 1063, 1063, 1063, 1063, 1063, 1063,
-+     1063, 1063, 1063, 1063, 1063, 1063, 1064,  733, 1064, 1064,
-+     1064, 1064, 1064, 1064, 1064, 1064, 1064, 1064, 1064,  732,
-+     1064, 1064, 1064, 1064, 1064, 1065, 1065,  731,  730,  729,
-+      727,  725, 1065, 1066, 1066, 1066, 1066,  724,  723,  722,
-+     1066, 1066, 1066,  721, 1066, 1067,  720, 1067, 1067, 1067,
-      1067, 1067, 1067, 1067, 1067, 1067, 1067, 1067, 1067, 1067,
--     1067, 1067, 1067, 1067, 1068, 1068, 1068, 1068, 1068, 1068,
-+     1067, 1067, 1067, 1067, 1068,  719, 1068, 1068, 1068, 1068,
-      1068, 1068, 1068, 1068, 1068, 1068, 1068, 1068, 1068, 1068,
--     1068, 1068, 1069, 1069, 1069, 1069, 1069, 1069, 1069, 1069,
--     1069, 1069, 1069, 1069, 1069, 1069, 1069, 1069, 1069, 1069,
- 
--      728,  727,  726,  725,  723,  721,  720,  719,  718,  717,
--      716,  715,  713,  712,  711,  710,  709,  708,  707,  706,
--      705,  704,  703,  701,  699,  692,  690,  687,  686,  685,
--      684,  683,  682,  681,  679,  677,  675,  673,  672,  671,
--      670,  669,  668,  667,  666,  665,  664,  663,  662,  661,
--      660,  657,  656,  655,  636,  635,  631,  630,  627,  626,
--      624,  623,  622,  621,  620,  619,  618,  617,  616,  615,
--      614,  613,  612,  611,  610,  608,  607,  606,  605,  603,
--      602,  601,  600,  599,  598,  597,  596,  595,  594,  593,
--      591,  590,  588,  587,  585,  583,  580,  578,  577,  576,
--
--      575,  561,  560,  559,  558,  552,  551,  547,  546,  545,
--      541,  540,  539,  538,  537,  536,  535,  534,  533,  532,
--      531,  530,  527,  526,  525,  524,  523,  522,  521,  520,
--      519,  517,  516,  515,  514,  513,  512,  511,  509,  508,
--      507,  506,  503,  502,  500,  499,  498,  497,  496,  495,
--      494,  491,  490,  489,  488,  476,  474,  473,  472,  471,
--      466,  462,  458,  457,  456,  449,  448,  447,  446,  445,
--      444,  443,  442,  441,  440,  438,  437,  436,  435,  434,
--      432,  431,  430,  429,  428,  427,  426,  425,  424,  423,
--      422,  421,  420,  419,  418,  417,  416,  415,  413,  412,
--
--      411,  409,  408,  407,  406,  405,  404,  403,  402,  401,
--      400,  399,  396,  395,  384,  379,  378,  375,  373,  369,
--      360,  351,  349,  348,  347,  345,  340,  335,  333,  332,
--      330,  327,  325,  324,  322,  320,  319,  318,  316,  315,
--      314,  313,  311,  310,  309,  307,  306,  303,  302,  300,
--      298,  297,  296,  292,  279,  278,  260,  259,  258,  255,
--      252,  251,  246,  243,  238,  234,  233,  232,  231,  228,
--      220,  219,  216,  215,  208,  200,  198,  194,  189,  185,
--      182,  181,  180,  179,  178,  177,  176,  174,  171,  170,
--      169,  166,  165,  160,  159,  158,  157,  155,  153,  152,
--
--      150,  148,  147,  141,  138,  129,  128,  126,  123,  118,
--      116,  111,  107,  101,   96,   94,   93,   90,   88,   86,
--       85,   84,   81,   77,   75,   73,   69,   67,   61,   57,
--       52,   49,   45,   41,   16,   15,   10,    8,    7,  972,
--      972,  972,  972,  972,  972,  972,  972,  972,  972,  972,
--      972,  972,  972,  972,  972,  972,  972,  972,  972,  972,
--      972,  972,  972,  972,  972,  972,  972,  972,  972,  972,
--      972,  972,  972,  972,  972,  972,  972,  972,  972,  972,
--      972,  972,  972,  972,  972,  972,  972,  972,  972,  972,
--      972,  972,  972,  972,  972,  972,  972,  972,  972
-+     1068, 1068, 1068, 1069,  717, 1069, 1069, 1069, 1069, 1069,
-+     1069, 1069, 1069, 1069, 1069, 1069, 1069, 1069, 1069, 1069,
-+     1069, 1069, 1070, 1070, 1070, 1070,  716,  715,  714, 1070,
-+     1070, 1070, 1071,  713, 1071, 1071, 1071, 1071, 1071, 1071,
-+     1071, 1071, 1071, 1071, 1071, 1071, 1071, 1071, 1071, 1071,
-+     1071, 1072, 1072, 1072, 1072, 1072, 1072, 1072, 1072, 1072,
-+     1072, 1072, 1072, 1072, 1072, 1072, 1072, 1072, 1072, 1072,
-+     1073, 1073, 1073, 1073, 1073, 1073, 1073, 1073, 1073, 1073,
-+     1073, 1073, 1073, 1073, 1073, 1073, 1073, 1073, 1073,  712,
-+      711,  710,  709,  708,  707,  705,  703,  696,  694,  691,
-+
-+      690,  689,  688,  687,  686,  685,  683,  681,  679,  677,
-+      676,  675,  674,  673,  672,  671,  670,  669,  668,  667,
-+      666,  665,  664,  661,  660,  659,  640,  639,  635,  634,
-+      631,  630,  628,  627,  626,  625,  624,  623,  622,  621,
-+      620,  619,  618,  617,  616,  615,  614,  612,  611,  610,
-+      609,  607,  606,  605,  604,  603,  602,  601,  600,  599,
-+      598,  597,  595,  594,  592,  591,  589,  587,  584,  582,
-+      581,  580,  579,  565,  564,  563,  562,  556,  555,  551,
-+      550,  549,  545,  544,  543,  542,  541,  540,  539,  538,
-+      537,  536,  535,  534,  531,  530,  529,  528,  527,  526,
-+
-+      525,  524,  523,  521,  520,  519,  518,  517,  516,  515,
-+      513,  512,  511,  510,  507,  506,  504,  503,  502,  501,
-+      500,  499,  498,  495,  494,  493,  492,  480,  478,  477,
-+      476,  475,  470,  466,  462,  461,  460,  453,  452,  451,
-+      450,  449,  448,  447,  446,  445,  444,  442,  441,  440,
-+      439,  438,  436,  435,  434,  433,  432,  431,  430,  429,
-+      428,  427,  426,  425,  424,  423,  422,  421,  420,  419,
-+      417,  416,  415,  413,  412,  411,  410,  409,  408,  407,
-+      406,  405,  404,  403,  400,  399,  388,  383,  382,  379,
-+      377,  373,  364,  355,  353,  352,  351,  349,  344,  339,
-+
-+      337,  336,  334,  331,  329,  328,  326,  324,  323,  322,
-+      320,  319,  318,  317,  315,  314,  313,  311,  310,  307,
-+      306,  304,  302,  301,  300,  296,  281,  280,  262,  261,
-+      260,  257,  254,  253,  248,  245,  240,  236,  235,  234,
-+      233,  230,  222,  221,  218,  217,  210,  202,  200,  196,
-+      191,  187,  184,  183,  182,  181,  180,  179,  178,  176,
-+      173,  172,  171,  168,  167,  162,  161,  160,  159,  157,
-+      155,  154,  152,  150,  149,  143,  140,  139,  138,  129,
-+      128,  126,  123,  118,  116,  111,  107,  101,   96,   94,
-+       93,   90,   88,   86,   85,   84,   81,   77,   75,   73,
- 
-+       69,   67,   61,   57,   52,   49,   45,   41,   16,   15,
-+       10,    8,    7,  976,  976,  976,  976,  976,  976,  976,
-+      976,  976,  976,  976,  976,  976,  976,  976,  976,  976,
-+      976,  976,  976,  976,  976,  976,  976,  976,  976,  976,
-+      976,  976,  976,  976,  976,  976,  976,  976,  976,  976,
-+      976,  976,  976,  976,  976,  976,  976,  976,  976,  976,
-+      976,  976,  976,  976,  976,  976,  976,  976,  976,  976,
-+      976,  976,  976
-     } ;
- 
- static yy_state_type yy_last_accepting_state;
-@@ -1596,7 +1614,7 @@
- 
- 
- 
--#line 1600 "scan.c"
-+#line 1618 "scan.c"
- 
- #define INITIAL 0
- #define SECT2 1
-@@ -1619,11 +1637,13 @@
- #define LINEDIR 18
- #define CODEBLOCK_MATCH_BRACE 19
- 
-+#ifndef YY_NO_UNISTD_H
- /* Special case for "unistd.h", since it is non-ANSI. We include it way
-  * down here because we want the user's section 1 to have been scanned first.
-  * The user has a chance to override it with an option.
-  */
- #include <unistd.h>
-+#endif
- 
- #ifndef YY_EXTRA_TYPE
- #define YY_EXTRA_TYPE void *
-@@ -1786,7 +1806,7 @@
- 	Char nmdef[MAXLINE];
- 
- 
--#line 1790 "scan.c"
-+#line 1810 "scan.c"
- 
- 	if ( (yy_init) )
- 		{
-@@ -1840,13 +1860,13 @@
- 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
- 				{
- 				yy_current_state = (int) yy_def[yy_current_state];
--				if ( yy_current_state >= 973 )
-+				if ( yy_current_state >= 977 )
- 					yy_c = yy_meta[(unsigned int) yy_c];
- 				}
- 			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
- 			++yy_cp;
- 			}
--		while ( yy_base[yy_current_state] != 3240 );
-+		while ( yy_base[yy_current_state] != 3314 );
- 
- yy_find_action:
- 		yy_act = yy_accept[yy_current_state];
-@@ -2029,55 +2049,73 @@
- ACTION_ECHO;
- 	YY_BREAK
- case 24:
--/* rule 24 can match eol */
- YY_RULE_SETUP
- #line 198 "scan.l"
-+ACTION_ECHO;
-+	YY_BREAK
-+case 25:
-+/* rule 25 can match eol */
-+YY_RULE_SETUP
-+#line 199 "scan.l"
- ++linenum; ACTION_ECHO;
- 	YY_BREAK
-+case 26:
-+YY_RULE_SETUP
-+#line 200 "scan.l"
-+add_action("[" "[]" "]m4_" "userquote_start()");
-+	YY_BREAK
-+case 27:
-+YY_RULE_SETUP
-+#line 201 "scan.l"
-+add_action("[" "[]" "]m4_" "userquote_end()");
-+	YY_BREAK
-+/* Macros need to be clearly separated from surrounding
-+			 * text and this file needs to go through flex untouched.
-+			 */
- 
- 
--case 25:
--/* rule 25 can match eol */
-+case 28:
-+/* rule 28 can match eol */
- YY_RULE_SETUP
--#line 202 "scan.l"
-+#line 208 "scan.l"
- yy_pop_state();
- 	YY_BREAK
--case 26:
-+case 29:
- YY_RULE_SETUP
--#line 203 "scan.l"
-+#line 209 "scan.l"
- linenum = myctoi( yytext );
- 	YY_BREAK
--case 27:
-+case 30:
- YY_RULE_SETUP
--#line 205 "scan.l"
-+#line 211 "scan.l"
- {
- 			flex_free( (void *) infilename );
- 			infilename = copy_string( yytext + 1 );
- 			infilename[strlen( infilename ) - 1] = '\0';
- 			}
- 	YY_BREAK
--case 28:
-+case 31:
- YY_RULE_SETUP
--#line 210 "scan.l"
-+#line 216 "scan.l"
- /* ignore spurious characters */
- 	YY_BREAK
- 
- 
--case 29:
--/* rule 29 can match eol */
-+case 32:
-+/* rule 32 can match eol */
- YY_RULE_SETUP
--#line 214 "scan.l"
-+#line 220 "scan.l"
- ++linenum; BEGIN(INITIAL);
- 	YY_BREAK
--case 30:
-+case 33:
- YY_RULE_SETUP
--#line 216 "scan.l"
-+#line 222 "scan.l"
- ACTION_ECHO;
- 	YY_BREAK
--case 31:
--/* rule 31 can match eol */
-+case 34:
-+/* rule 34 can match eol */
- YY_RULE_SETUP
--#line 218 "scan.l"
-+#line 224 "scan.l"
- {
- 			++linenum;
- 			ACTION_ECHO;
-@@ -2087,9 +2125,9 @@
- 	YY_BREAK
- 
- 
--case 32:
-+case 35:
- YY_RULE_SETUP
--#line 227 "scan.l"
-+#line 233 "scan.l"
- {
-                 if( --brace_depth == 0){
-                     /* TODO: Matched. */
-@@ -2098,32 +2136,32 @@
-                     buf_strnappend(&top_buf, yytext, yyleng);
-             }
- 	YY_BREAK
--case 33:
-+case 36:
- YY_RULE_SETUP
--#line 235 "scan.l"
-+#line 241 "scan.l"
- {   
-                 brace_depth++;
-                 buf_strnappend(&top_buf, yytext, yyleng);
-             }
- 	YY_BREAK
--case 34:
--/* rule 34 can match eol */
-+case 37:
-+/* rule 37 can match eol */
- YY_RULE_SETUP
--#line 240 "scan.l"
-+#line 246 "scan.l"
- {
-                 ++linenum;
-                 buf_strnappend(&top_buf, yytext, yyleng);
-             }
- 	YY_BREAK
--case 35:
-+case 38:
- YY_RULE_SETUP
--#line 245 "scan.l"
-+#line 251 "scan.l"
- {
-                 buf_strnappend(&top_buf, yytext, yyleng);
-                 }
- 	YY_BREAK
- case YY_STATE_EOF(CODEBLOCK_MATCH_BRACE):
--#line 249 "scan.l"
-+#line 255 "scan.l"
- {
-                 linenum = brace_start_line;
-                 synerr(_("Unmatched '{'"));
-@@ -2132,14 +2170,14 @@
- 	YY_BREAK
- 
- 
--case 36:
-+case 39:
- YY_RULE_SETUP
--#line 258 "scan.l"
-+#line 264 "scan.l"
- /* separates name and definition */
- 	YY_BREAK
--case 37:
-+case 40:
- YY_RULE_SETUP
--#line 260 "scan.l"
-+#line 266 "scan.l"
- {
-  		        if(yyleng < MAXLINE)
-  		         {
-@@ -2162,10 +2200,10 @@
- 			didadef = true;
- 			}
- 	YY_BREAK
--case 38:
--/* rule 38 can match eol */
-+case 41:
-+/* rule 41 can match eol */
- YY_RULE_SETUP
--#line 282 "scan.l"
-+#line 288 "scan.l"
- {
- 			if ( ! didadef )
- 				synerr( _( "incomplete name definition" ) );
-@@ -2175,156 +2213,156 @@
- 	YY_BREAK
- 
- 
--case 39:
--/* rule 39 can match eol */
-+case 42:
-+/* rule 42 can match eol */
- YY_RULE_SETUP
--#line 292 "scan.l"
-+#line 298 "scan.l"
- ++linenum; BEGIN(INITIAL);
- 	YY_BREAK
--case 40:
-+case 43:
- YY_RULE_SETUP
--#line 293 "scan.l"
-+#line 299 "scan.l"
- option_sense = true;
- 	YY_BREAK
--case 41:
-+case 44:
- YY_RULE_SETUP
--#line 295 "scan.l"
-+#line 301 "scan.l"
- return '=';
- 	YY_BREAK
--case 42:
-+case 45:
- YY_RULE_SETUP
--#line 297 "scan.l"
-+#line 303 "scan.l"
- option_sense = ! option_sense;
- 	YY_BREAK
--case 43:
-+case 46:
- YY_RULE_SETUP
--#line 299 "scan.l"
-+#line 305 "scan.l"
- csize = option_sense ? 128 : 256;
- 	YY_BREAK
--case 44:
-+case 47:
- YY_RULE_SETUP
--#line 300 "scan.l"
-+#line 306 "scan.l"
- csize = option_sense ? 256 : 128;
- 	YY_BREAK
--case 45:
-+case 48:
- YY_RULE_SETUP
--#line 302 "scan.l"
-+#line 308 "scan.l"
- long_align = option_sense;
- 	YY_BREAK
--case 46:
-+case 49:
- YY_RULE_SETUP
--#line 303 "scan.l"
-+#line 309 "scan.l"
- {
- 			ACTION_M4_IFDEF( "M4""_YY_ALWAYS_INTERACTIVE", option_sense );
-             interactive = option_sense;
- 			}
- 	YY_BREAK
--case 47:
-+case 50:
- YY_RULE_SETUP
--#line 307 "scan.l"
-+#line 313 "scan.l"
- yytext_is_array = option_sense;
- 	YY_BREAK
--case 48:
-+case 51:
- YY_RULE_SETUP
--#line 308 "scan.l"
-+#line 314 "scan.l"
- ansi_func_defs = option_sense;
- 	YY_BREAK
--case 49:
-+case 52:
- YY_RULE_SETUP
--#line 309 "scan.l"
-+#line 315 "scan.l"
- ansi_func_protos = option_sense;
- 	YY_BREAK
--case 50:
-+case 53:
- YY_RULE_SETUP
--#line 310 "scan.l"
-+#line 316 "scan.l"
- backing_up_report = option_sense;
- 	YY_BREAK
--case 51:
-+case 54:
- YY_RULE_SETUP
--#line 311 "scan.l"
-+#line 317 "scan.l"
- interactive = ! option_sense;
- 	YY_BREAK
--case 52:
-+case 55:
- YY_RULE_SETUP
--#line 312 "scan.l"
-+#line 318 "scan.l"
- bison_bridge_lval = option_sense;
- 	YY_BREAK
--case 53:
-+case 56:
- YY_RULE_SETUP
--#line 313 "scan.l"
-+#line 319 "scan.l"
- { if((bison_bridge_lloc = option_sense))
-                             bison_bridge_lval = true;
-                      }
- 	YY_BREAK
--case 54:
-+case 57:
- YY_RULE_SETUP
--#line 316 "scan.l"
-+#line 322 "scan.l"
- C_plus_plus = option_sense;
- 	YY_BREAK
--case 55:
-+case 58:
- YY_RULE_SETUP
--#line 317 "scan.l"
-+#line 323 "scan.l"
- caseins = ! option_sense;
- 	YY_BREAK
--case 56:
-+case 59:
- YY_RULE_SETUP
--#line 318 "scan.l"
-+#line 324 "scan.l"
- caseins = option_sense;
- 	YY_BREAK
--case 57:
-+case 60:
- YY_RULE_SETUP
--#line 319 "scan.l"
-+#line 325 "scan.l"
- ddebug = option_sense;
- 	YY_BREAK
--case 58:
-+case 61:
- YY_RULE_SETUP
--#line 320 "scan.l"
-+#line 326 "scan.l"
- spprdflt = ! option_sense;
- 	YY_BREAK
--case 59:
-+case 62:
- YY_RULE_SETUP
--#line 321 "scan.l"
-+#line 327 "scan.l"
- useecs = option_sense;
- 	YY_BREAK
--case 60:
-+case 63:
- YY_RULE_SETUP
--#line 322 "scan.l"
-+#line 328 "scan.l"
- {
- 			useecs = usemecs = false;
- 			use_read = fullspd = true;
- 			}
- 	YY_BREAK
--case 61:
-+case 64:
- YY_RULE_SETUP
--#line 326 "scan.l"
-+#line 332 "scan.l"
- {
- 			useecs = usemecs = false;
- 			use_read = fulltbl = true;
- 			}
- 	YY_BREAK
--case 62:
-+case 65:
- YY_RULE_SETUP
--#line 330 "scan.l"
-+#line 336 "scan.l"
- ACTION_IFDEF("YY_NO_INPUT", ! option_sense);
- 	YY_BREAK
--case 63:
-+case 66:
- YY_RULE_SETUP
--#line 331 "scan.l"
-+#line 337 "scan.l"
- interactive = option_sense;
- 	YY_BREAK
--case 64:
-+case 67:
- YY_RULE_SETUP
--#line 332 "scan.l"
-+#line 338 "scan.l"
- lex_compat = option_sense;
- 	YY_BREAK
--case 65:
-+case 68:
- YY_RULE_SETUP
--#line 333 "scan.l"
-+#line 339 "scan.l"
- posix_compat = option_sense;
- 	YY_BREAK
--case 66:
-+case 69:
- YY_RULE_SETUP
--#line 334 "scan.l"
-+#line 340 "scan.l"
- {
- 			ACTION_M4_IFDEF( "M4""_YY_MAIN", option_sense);
-             /* Override yywrap */
-@@ -2332,256 +2370,256 @@
-                 do_yywrap = false;
- 			}
- 	YY_BREAK
--case 67:
-+case 70:
- YY_RULE_SETUP
--#line 340 "scan.l"
-+#line 346 "scan.l"
- usemecs = option_sense;
- 	YY_BREAK
--case 68:
-+case 71:
- YY_RULE_SETUP
--#line 341 "scan.l"
-+#line 347 "scan.l"
- {
- 			ACTION_M4_IFDEF( "M4""_YY_NEVER_INTERACTIVE", option_sense );
-             interactive = !option_sense;
- 			}
- 	YY_BREAK
--case 69:
-+case 72:
- YY_RULE_SETUP
--#line 345 "scan.l"
-+#line 351 "scan.l"
- performance_report += option_sense ? 1 : -1;
- 	YY_BREAK
--case 70:
-+case 73:
- YY_RULE_SETUP
--#line 346 "scan.l"
-+#line 352 "scan.l"
- yytext_is_array = ! option_sense;
- 	YY_BREAK
--case 71:
-+case 74:
- YY_RULE_SETUP
--#line 347 "scan.l"
-+#line 353 "scan.l"
- use_read = option_sense;
- 	YY_BREAK
--case 72:
-+case 75:
- YY_RULE_SETUP
--#line 348 "scan.l"
-+#line 354 "scan.l"
- reentrant = option_sense;
- 	YY_BREAK
--case 73:
-+case 76:
- YY_RULE_SETUP
--#line 349 "scan.l"
-+#line 355 "scan.l"
- reject_really_used = option_sense;
- 	YY_BREAK
--case 74:
-+case 77:
- YY_RULE_SETUP
--#line 350 "scan.l"
-+#line 356 "scan.l"
- ACTION_M4_IFDEF( "M4""_YY_STACK_USED", option_sense );
- 	YY_BREAK
--case 75:
-+case 78:
- YY_RULE_SETUP
--#line 351 "scan.l"
-+#line 357 "scan.l"
- do_stdinit = option_sense;
- 	YY_BREAK
--case 76:
-+case 79:
- YY_RULE_SETUP
--#line 352 "scan.l"
-+#line 358 "scan.l"
- use_stdout = option_sense;
- 	YY_BREAK
--case 77:
-+case 80:
- YY_RULE_SETUP
--#line 353 "scan.l"
-+#line 359 "scan.l"
- ACTION_IFDEF("YY_NO_UNISTD_H", ! option_sense);
- 	YY_BREAK
--case 78:
-+case 81:
- YY_RULE_SETUP
--#line 354 "scan.l"
-+#line 360 "scan.l"
- ACTION_M4_IFDEF("M4""_YY_NO_UNPUT", ! option_sense);
- 	YY_BREAK
--case 79:
-+case 82:
- YY_RULE_SETUP
--#line 355 "scan.l"
-+#line 361 "scan.l"
- printstats = option_sense;
- 	YY_BREAK
--case 80:
-+case 83:
- YY_RULE_SETUP
--#line 356 "scan.l"
-+#line 362 "scan.l"
- nowarn = ! option_sense;
- 	YY_BREAK
--case 81:
-+case 84:
- YY_RULE_SETUP
--#line 357 "scan.l"
-+#line 363 "scan.l"
- do_yylineno = option_sense; ACTION_M4_IFDEF("M4""_YY_USE_LINENO", option_sense);
- 	YY_BREAK
--case 82:
-+case 85:
- YY_RULE_SETUP
--#line 358 "scan.l"
-+#line 364 "scan.l"
- yymore_really_used = option_sense;
- 	YY_BREAK
--case 83:
-+case 86:
- YY_RULE_SETUP
--#line 359 "scan.l"
-+#line 365 "scan.l"
- do_yywrap = option_sense;
- 	YY_BREAK
--case 84:
-+case 87:
- YY_RULE_SETUP
--#line 361 "scan.l"
-+#line 367 "scan.l"
- ACTION_M4_IFDEF("M4""_YY_NO_PUSH_STATE", ! option_sense);
- 	YY_BREAK
--case 85:
-+case 88:
- YY_RULE_SETUP
--#line 362 "scan.l"
-+#line 368 "scan.l"
- ACTION_M4_IFDEF("M4""_YY_NO_POP_STATE", ! option_sense);
- 	YY_BREAK
--case 86:
-+case 89:
- YY_RULE_SETUP
--#line 363 "scan.l"
-+#line 369 "scan.l"
- ACTION_M4_IFDEF("M4""_YY_NO_TOP_STATE", ! option_sense);
- 	YY_BREAK
--case 87:
-+case 90:
- YY_RULE_SETUP
--#line 365 "scan.l"
-+#line 371 "scan.l"
- ACTION_M4_IFDEF("M4""_YY_NO_SCAN_BUFFER", ! option_sense);
- 	YY_BREAK
--case 88:
-+case 91:
- YY_RULE_SETUP
--#line 366 "scan.l"
-+#line 372 "scan.l"
- ACTION_M4_IFDEF("M4""_YY_NO_SCAN_BYTES", ! option_sense);
- 	YY_BREAK
--case 89:
-+case 92:
- YY_RULE_SETUP
--#line 367 "scan.l"
-+#line 373 "scan.l"
- ACTION_M4_IFDEF("M4""_YY_NO_SCAN_STRING", ! option_sense);
- 	YY_BREAK
--case 90:
-+case 93:
- YY_RULE_SETUP
--#line 369 "scan.l"
-+#line 375 "scan.l"
- ACTION_M4_IFDEF("M4""_YY_NO_FLEX_ALLOC", ! option_sense);
- 	YY_BREAK
--case 91:
-+case 94:
- YY_RULE_SETUP
--#line 370 "scan.l"
-+#line 376 "scan.l"
- ACTION_M4_IFDEF("M4""_YY_NO_FLEX_REALLOC", ! option_sense);
- 	YY_BREAK
--case 92:
-+case 95:
- YY_RULE_SETUP
--#line 371 "scan.l"
-+#line 377 "scan.l"
- ACTION_M4_IFDEF("M4""_YY_NO_FLEX_FREE", ! option_sense);
- 	YY_BREAK
--case 93:
-+case 96:
- YY_RULE_SETUP
--#line 373 "scan.l"
-+#line 379 "scan.l"
- ACTION_M4_IFDEF("M4""_YY_NO_GET_DEBUG", ! option_sense);
- 	YY_BREAK
--case 94:
-+case 97:
- YY_RULE_SETUP
--#line 374 "scan.l"
-+#line 380 "scan.l"
- ACTION_M4_IFDEF("M4""_YY_NO_SET_DEBUG", ! option_sense);
- 	YY_BREAK
--case 95:
-+case 98:
- YY_RULE_SETUP
--#line 375 "scan.l"
-+#line 381 "scan.l"
- ACTION_M4_IFDEF("M4""_YY_NO_GET_EXTRA", ! option_sense);
- 	YY_BREAK
--case 96:
-+case 99:
- YY_RULE_SETUP
--#line 376 "scan.l"
-+#line 382 "scan.l"
- ACTION_M4_IFDEF("M4""_YY_NO_SET_EXTRA", ! option_sense);
- 	YY_BREAK
--case 97:
-+case 100:
- YY_RULE_SETUP
--#line 377 "scan.l"
-+#line 383 "scan.l"
- ACTION_M4_IFDEF("M4""_YY_NO_GET_LENG", ! option_sense);
- 	YY_BREAK
--case 98:
-+case 101:
- YY_RULE_SETUP
--#line 378 "scan.l"
-+#line 384 "scan.l"
- ACTION_M4_IFDEF("M4""_YY_NO_GET_TEXT", ! option_sense);
- 	YY_BREAK
--case 99:
-+case 102:
- YY_RULE_SETUP
--#line 379 "scan.l"
-+#line 385 "scan.l"
- ACTION_M4_IFDEF("M4""_YY_NO_GET_LINENO", ! option_sense);
- 	YY_BREAK
--case 100:
-+case 103:
- YY_RULE_SETUP
--#line 380 "scan.l"
-+#line 386 "scan.l"
- ACTION_M4_IFDEF("M4""_YY_NO_SET_LINENO", ! option_sense);
- 	YY_BREAK
--case 101:
-+case 104:
- YY_RULE_SETUP
--#line 381 "scan.l"
-+#line 387 "scan.l"
- ACTION_M4_IFDEF("M4""_YY_NO_GET_IN", ! option_sense);
- 	YY_BREAK
--case 102:
-+case 105:
- YY_RULE_SETUP
--#line 382 "scan.l"
-+#line 388 "scan.l"
- ACTION_M4_IFDEF("M4""_YY_NO_SET_IN", ! option_sense);
- 	YY_BREAK
--case 103:
-+case 106:
- YY_RULE_SETUP
--#line 383 "scan.l"
-+#line 389 "scan.l"
- ACTION_M4_IFDEF("M4""_YY_NO_GET_OUT", ! option_sense);
- 	YY_BREAK
--case 104:
-+case 107:
- YY_RULE_SETUP
--#line 384 "scan.l"
-+#line 390 "scan.l"
- ACTION_M4_IFDEF("M4""_YY_NO_SET_OUT", ! option_sense);
- 	YY_BREAK
--case 105:
-+case 108:
- YY_RULE_SETUP
--#line 385 "scan.l"
-+#line 391 "scan.l"
- ACTION_M4_IFDEF("M4""_YY_NO_GET_LVAL", ! option_sense);
- 	YY_BREAK
--case 106:
-+case 109:
- YY_RULE_SETUP
--#line 386 "scan.l"
-+#line 392 "scan.l"
- ACTION_M4_IFDEF("M4""_YY_NO_SET_LVAL", ! option_sense);
- 	YY_BREAK
--case 107:
-+case 110:
- YY_RULE_SETUP
--#line 387 "scan.l"
-+#line 393 "scan.l"
- ACTION_M4_IFDEF("M4""_YY_NO_GET_LLOC", ! option_sense);
- 	YY_BREAK
--case 108:
-+case 111:
- YY_RULE_SETUP
--#line 388 "scan.l"
-+#line 394 "scan.l"
- ACTION_M4_IFDEF("M4""_YY_NO_SET_LLOC", ! option_sense);
- 	YY_BREAK
--case 109:
-+case 112:
- YY_RULE_SETUP
--#line 390 "scan.l"
-+#line 396 "scan.l"
- return OPT_OUTFILE;
- 	YY_BREAK
--case 110:
-+case 113:
- YY_RULE_SETUP
--#line 391 "scan.l"
-+#line 397 "scan.l"
- return OPT_PREFIX;
- 	YY_BREAK
--case 111:
-+case 114:
- YY_RULE_SETUP
--#line 392 "scan.l"
-+#line 398 "scan.l"
- return OPT_YYCLASS;
- 	YY_BREAK
--case 112:
-+case 115:
- YY_RULE_SETUP
--#line 393 "scan.l"
-+#line 399 "scan.l"
- return OPT_HEADER;
- 	YY_BREAK
--case 113:
-+case 116:
- YY_RULE_SETUP
--#line 394 "scan.l"
-+#line 400 "scan.l"
- return OPT_TABLES;
- 	YY_BREAK
--case 114:
-+case 117:
- YY_RULE_SETUP
--#line 395 "scan.l"
-+#line 401 "scan.l"
- {
-                     tablesverify = option_sense;
-                     if(!tablesext && option_sense)
-                         tablesext = true;
-                     }
- 	YY_BREAK
--case 115:
-+case 118:
- YY_RULE_SETUP
--#line 402 "scan.l"
-+#line 408 "scan.l"
- {
- 			if(yyleng-1 < MAXLINE) 
-         		 { 
-@@ -2596,9 +2634,9 @@
- 			return NAME;
- 			}
- 	YY_BREAK
--case 116:
-+case 119:
- YY_RULE_SETUP
--#line 416 "scan.l"
-+#line 422 "scan.l"
- {
- 			format_synerr( _( "unrecognized %%option: %s" ),
- 				yytext );
-@@ -2606,31 +2644,31 @@
- 			}
- 	YY_BREAK
- 
--case 117:
--/* rule 117 can match eol */
-+case 120:
-+/* rule 120 can match eol */
- YY_RULE_SETUP
--#line 423 "scan.l"
-+#line 429 "scan.l"
- ++linenum; BEGIN(INITIAL);
- 	YY_BREAK
- 
--case 118:
-+case 121:
- YY_RULE_SETUP
--#line 427 "scan.l"
-+#line 433 "scan.l"
- ++bracelevel; yyless( 2 );	/* eat only %{ */
- 	YY_BREAK
--case 119:
-+case 122:
- YY_RULE_SETUP
--#line 428 "scan.l"
-+#line 434 "scan.l"
- --bracelevel; yyless( 2 );	/* eat only %} */
- 	YY_BREAK
--case 120:
-+case 123:
- YY_RULE_SETUP
--#line 430 "scan.l"
-+#line 436 "scan.l"
- ACTION_ECHO;	/* indented code in prolog */
- 	YY_BREAK
--case 121:
-+case 124:
- YY_RULE_SETUP
--#line 432 "scan.l"
-+#line 438 "scan.l"
- {	/* non-indented code */
- 			if ( bracelevel <= 0 )
- 				{ /* not in %{ ... %} */
-@@ -2643,19 +2681,19 @@
- 				ACTION_ECHO;
- 			}
- 	YY_BREAK
--case 122:
-+case 125:
- YY_RULE_SETUP
--#line 444 "scan.l"
-+#line 450 "scan.l"
- ACTION_ECHO;
- 	YY_BREAK
--case 123:
--/* rule 123 can match eol */
-+case 126:
-+/* rule 126 can match eol */
- YY_RULE_SETUP
--#line 445 "scan.l"
-+#line 451 "scan.l"
- ++linenum; ACTION_ECHO;
- 	YY_BREAK
- case YY_STATE_EOF(SECT2PROLOG):
--#line 447 "scan.l"
-+#line 453 "scan.l"
- {
- 			mark_prolog();
- 			sectnum = 0;
-@@ -2664,15 +2702,15 @@
- 	YY_BREAK
- 
- 
--case 124:
--/* rule 124 can match eol */
-+case 127:
-+/* rule 127 can match eol */
- YY_RULE_SETUP
--#line 455 "scan.l"
-+#line 461 "scan.l"
- ++linenum; /* allow blank lines in section 2 */
- 	YY_BREAK
--case 125:
-+case 128:
- YY_RULE_SETUP
--#line 457 "scan.l"
-+#line 463 "scan.l"
- {
- 			indented_code = false;
- 			doing_codeblock = true;
-@@ -2680,27 +2718,27 @@
- 			BEGIN(PERCENT_BRACE_ACTION);
- 			}
- 	YY_BREAK
--case 126:
-+case 129:
- YY_RULE_SETUP
--#line 464 "scan.l"
-+#line 470 "scan.l"
- BEGIN(SC); return '<';
- 	YY_BREAK
--case 127:
-+case 130:
- YY_RULE_SETUP
--#line 465 "scan.l"
-+#line 471 "scan.l"
- return '^';
- 	YY_BREAK
--case 128:
-+case 131:
- YY_RULE_SETUP
--#line 466 "scan.l"
-+#line 472 "scan.l"
- BEGIN(QUOTE); return '"';
- 	YY_BREAK
--case 129:
-+case 132:
- *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
- (yy_c_buf_p) = yy_cp = yy_bp + 1;
- YY_DO_BEFORE_ACTION; /* set up yytext again */
- YY_RULE_SETUP
--#line 467 "scan.l"
-+#line 473 "scan.l"
- {
- 			BEGIN(NUM);
- 			if ( lex_compat || posix_compat )
-@@ -2709,18 +2747,18 @@
- 				return BEGIN_REPEAT_FLEX;
- 			}
- 	YY_BREAK
--case 130:
--/* rule 130 can match eol */
-+case 133:
-+/* rule 133 can match eol */
- *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
- (yy_c_buf_p) = yy_cp = yy_bp + 1;
- YY_DO_BEFORE_ACTION; /* set up yytext again */
- YY_RULE_SETUP
--#line 474 "scan.l"
-+#line 480 "scan.l"
- return '$';
- 	YY_BREAK
--case 131:
-+case 134:
- YY_RULE_SETUP
--#line 476 "scan.l"
-+#line 482 "scan.l"
- {
- 			bracelevel = 1;
- 			BEGIN(PERCENT_BRACE_ACTION);
-@@ -2733,15 +2771,15 @@
- 				}
- 			}
- 	YY_BREAK
--case 132:
--/* rule 132 can match eol */
-+case 135:
-+/* rule 135 can match eol */
- YY_RULE_SETUP
--#line 487 "scan.l"
-+#line 493 "scan.l"
- continued_action = true; ++linenum; return '\n';
- 	YY_BREAK
--case 133:
-+case 136:
- YY_RULE_SETUP
--#line 489 "scan.l"
-+#line 495 "scan.l"
- {
- 			yyless( yyleng - 2 );	/* put back '/', '*' */
- 			bracelevel = 0;
-@@ -2749,14 +2787,14 @@
- 			BEGIN(ACTION);
- 			}
- 	YY_BREAK
--case 134:
-+case 137:
- YY_RULE_SETUP
--#line 496 "scan.l"
-+#line 502 "scan.l"
- /* allow indented rules */
- 	YY_BREAK
--case 135:
-+case 138:
- YY_RULE_SETUP
--#line 498 "scan.l"
-+#line 504 "scan.l"
- {
- 			/* This rule is separate from the one below because
- 			 * otherwise we get variable trailing context, so
-@@ -2774,10 +2812,10 @@
- 				}
- 			}
- 	YY_BREAK
--case 136:
--/* rule 136 can match eol */
-+case 139:
-+/* rule 139 can match eol */
- YY_RULE_SETUP
--#line 515 "scan.l"
-+#line 521 "scan.l"
- {
- 			bracelevel = 0;
- 			continued_action = false;
-@@ -2792,16 +2830,16 @@
- 				}
- 			}
- 	YY_BREAK
--case 137:
--#line 530 "scan.l"
--case 138:
-+case 140:
-+#line 536 "scan.l"
-+case 141:
- YY_RULE_SETUP
--#line 530 "scan.l"
-+#line 536 "scan.l"
- return EOF_OP;
- 	YY_BREAK
--case 139:
-+case 142:
- YY_RULE_SETUP
--#line 532 "scan.l"
-+#line 538 "scan.l"
- {
- 			sectnum = 3;
- 			BEGIN(SECT3);
-@@ -2809,9 +2847,9 @@
- 			yyterminate(); /* to stop the parser */
- 			}
- 	YY_BREAK
--case 140:
-+case 143:
- YY_RULE_SETUP
--#line 539 "scan.l"
-+#line 545 "scan.l"
- {
- 			int cclval;
- 
-@@ -2858,10 +2896,10 @@
-      * wrap the expanded regex in '(' ')' -- breaking trailing
-      * context.
-      */
--case 141:
--/* rule 141 can match eol */
-+case 144:
-+/* rule 144 can match eol */
- YY_RULE_SETUP
--#line 585 "scan.l"
-+#line 591 "scan.l"
- {
- 			register Char *nmdefptr;
-             int end_is_ws, end_ch;
-@@ -2910,76 +2948,76 @@
- 				}
- 			}
- 	YY_BREAK
--case 142:
-+case 145:
- YY_RULE_SETUP
--#line 633 "scan.l"
-+#line 639 "scan.l"
- return (unsigned char) yytext[0];
- 	YY_BREAK
--case 143:
-+case 146:
- YY_RULE_SETUP
--#line 634 "scan.l"
-+#line 640 "scan.l"
- RETURNCHAR;
- 	YY_BREAK
- 
- 
--case 144:
--/* rule 144 can match eol */
-+case 147:
-+/* rule 147 can match eol */
- YY_RULE_SETUP
--#line 639 "scan.l"
-+#line 645 "scan.l"
- ++linenum;	/* Allow blank lines & continuations */
- 	YY_BREAK
--case 145:
-+case 148:
- YY_RULE_SETUP
--#line 640 "scan.l"
-+#line 646 "scan.l"
- return (unsigned char) yytext[0];
- 	YY_BREAK
--case 146:
-+case 149:
- YY_RULE_SETUP
--#line 641 "scan.l"
-+#line 647 "scan.l"
- BEGIN(SECT2); return '>';
- 	YY_BREAK
--case 147:
-+case 150:
- *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
- (yy_c_buf_p) = yy_cp = yy_bp + 1;
- YY_DO_BEFORE_ACTION; /* set up yytext again */
- YY_RULE_SETUP
--#line 642 "scan.l"
-+#line 648 "scan.l"
- BEGIN(CARETISBOL); return '>';
- 	YY_BREAK
--case 148:
-+case 151:
- YY_RULE_SETUP
--#line 643 "scan.l"
-+#line 649 "scan.l"
- RETURNNAME;
- 	YY_BREAK
--case 149:
-+case 152:
- YY_RULE_SETUP
--#line 644 "scan.l"
-+#line 650 "scan.l"
- {
- 			format_synerr( _( "bad <start condition>: %s" ),
- 				yytext );
- 			}
- 	YY_BREAK
- 
--case 150:
-+case 153:
- YY_RULE_SETUP
--#line 650 "scan.l"
-+#line 656 "scan.l"
- BEGIN(SECT2); return '^';
- 	YY_BREAK
- 
--case 151:
-+case 154:
- YY_RULE_SETUP
--#line 654 "scan.l"
-+#line 660 "scan.l"
- RETURNCHAR;
- 	YY_BREAK
--case 152:
-+case 155:
- YY_RULE_SETUP
--#line 655 "scan.l"
-+#line 661 "scan.l"
- BEGIN(SECT2); return '"';
- 	YY_BREAK
--case 153:
--/* rule 153 can match eol */
-+case 156:
-+/* rule 156 can match eol */
- YY_RULE_SETUP
--#line 657 "scan.l"
-+#line 663 "scan.l"
- {
- 			synerr( _( "missing quote" ) );
- 			BEGIN(SECT2);
-@@ -2989,51 +3027,51 @@
- 	YY_BREAK
- 
- 
--case 154:
-+case 157:
- *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
- (yy_c_buf_p) = yy_cp = yy_bp + 1;
- YY_DO_BEFORE_ACTION; /* set up yytext again */
- YY_RULE_SETUP
--#line 667 "scan.l"
-+#line 673 "scan.l"
- BEGIN(CCL); return '^';
- 	YY_BREAK
--case 155:
-+case 158:
- *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
- (yy_c_buf_p) = yy_cp = yy_bp + 1;
- YY_DO_BEFORE_ACTION; /* set up yytext again */
- YY_RULE_SETUP
--#line 668 "scan.l"
-+#line 674 "scan.l"
- return '^';
- 	YY_BREAK
--case 156:
-+case 159:
- YY_RULE_SETUP
--#line 669 "scan.l"
-+#line 675 "scan.l"
- BEGIN(CCL); RETURNCHAR;
- 	YY_BREAK
- 
- 
--case 157:
-+case 160:
- *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
- (yy_c_buf_p) = yy_cp = yy_bp + 1;
- YY_DO_BEFORE_ACTION; /* set up yytext again */
- YY_RULE_SETUP
--#line 673 "scan.l"
-+#line 679 "scan.l"
- return '-';
- 	YY_BREAK
--case 158:
-+case 161:
- YY_RULE_SETUP
--#line 674 "scan.l"
-+#line 680 "scan.l"
- RETURNCHAR;
- 	YY_BREAK
--case 159:
-+case 162:
- YY_RULE_SETUP
--#line 675 "scan.l"
-+#line 681 "scan.l"
- BEGIN(SECT2); return ']';
- 	YY_BREAK
--case 160:
--/* rule 160 can match eol */
-+case 163:
-+/* rule 163 can match eol */
- YY_RULE_SETUP
--#line 676 "scan.l"
-+#line 682 "scan.l"
- {
- 			synerr( _( "bad character class" ) );
- 			BEGIN(SECT2);
-@@ -3042,69 +3080,69 @@
- 	YY_BREAK
- 
- 
--case 161:
-+case 164:
- YY_RULE_SETUP
--#line 684 "scan.l"
-+#line 690 "scan.l"
- BEGIN(CCL); return CCE_ALNUM;
- 	YY_BREAK
--case 162:
-+case 165:
- YY_RULE_SETUP
--#line 685 "scan.l"
-+#line 691 "scan.l"
- BEGIN(CCL); return CCE_ALPHA;
- 	YY_BREAK
--case 163:
-+case 166:
- YY_RULE_SETUP
--#line 686 "scan.l"
-+#line 692 "scan.l"
- BEGIN(CCL); return CCE_BLANK;
- 	YY_BREAK
--case 164:
-+case 167:
- YY_RULE_SETUP
--#line 687 "scan.l"
-+#line 693 "scan.l"
- BEGIN(CCL); return CCE_CNTRL;
- 	YY_BREAK
--case 165:
-+case 168:
- YY_RULE_SETUP
--#line 688 "scan.l"
-+#line 694 "scan.l"
- BEGIN(CCL); return CCE_DIGIT;
- 	YY_BREAK
--case 166:
-+case 169:
- YY_RULE_SETUP
--#line 689 "scan.l"
-+#line 695 "scan.l"
- BEGIN(CCL); return CCE_GRAPH;
- 	YY_BREAK
--case 167:
-+case 170:
- YY_RULE_SETUP
--#line 690 "scan.l"
-+#line 696 "scan.l"
- BEGIN(CCL); return CCE_LOWER;
- 	YY_BREAK
--case 168:
-+case 171:
- YY_RULE_SETUP
--#line 691 "scan.l"
-+#line 697 "scan.l"
- BEGIN(CCL); return CCE_PRINT;
- 	YY_BREAK
--case 169:
-+case 172:
- YY_RULE_SETUP
--#line 692 "scan.l"
-+#line 698 "scan.l"
- BEGIN(CCL); return CCE_PUNCT;
- 	YY_BREAK
--case 170:
-+case 173:
- YY_RULE_SETUP
--#line 693 "scan.l"
-+#line 699 "scan.l"
- BEGIN(CCL); return CCE_SPACE;
- 	YY_BREAK
--case 171:
-+case 174:
- YY_RULE_SETUP
--#line 694 "scan.l"
-+#line 700 "scan.l"
- BEGIN(CCL); return CCE_UPPER;
- 	YY_BREAK
--case 172:
-+case 175:
- YY_RULE_SETUP
--#line 695 "scan.l"
-+#line 701 "scan.l"
- BEGIN(CCL); return CCE_XDIGIT;
- 	YY_BREAK
--case 173:
-+case 176:
- YY_RULE_SETUP
--#line 696 "scan.l"
-+#line 702 "scan.l"
- {
- 			format_synerr(
- 				_( "bad character class expression: %s" ),
-@@ -3114,22 +3152,22 @@
- 	YY_BREAK
- 
- 
--case 174:
-+case 177:
- YY_RULE_SETUP
--#line 705 "scan.l"
-+#line 711 "scan.l"
- {
- 			yylval = myctoi( yytext );
- 			return NUMBER;
- 			}
- 	YY_BREAK
--case 175:
-+case 178:
- YY_RULE_SETUP
--#line 710 "scan.l"
-+#line 716 "scan.l"
- return ',';
- 	YY_BREAK
--case 176:
-+case 179:
- YY_RULE_SETUP
--#line 711 "scan.l"
-+#line 717 "scan.l"
- {
- 			BEGIN(SECT2);
- 			if ( lex_compat || posix_compat )
-@@ -3138,19 +3176,19 @@
- 				return END_REPEAT_FLEX;
- 			}
- 	YY_BREAK
--case 177:
-+case 180:
- YY_RULE_SETUP
--#line 719 "scan.l"
-+#line 725 "scan.l"
- {
- 			synerr( _( "bad character inside {}'s" ) );
- 			BEGIN(SECT2);
- 			return '}';
- 			}
- 	YY_BREAK
--case 178:
--/* rule 178 can match eol */
-+case 181:
-+/* rule 181 can match eol */
- YY_RULE_SETUP
--#line 725 "scan.l"
-+#line 731 "scan.l"
- {
- 			synerr( _( "missing }" ) );
- 			BEGIN(SECT2);
-@@ -3160,43 +3198,43 @@
- 	YY_BREAK
- 
- 
--case 179:
-+case 182:
- YY_RULE_SETUP
--#line 735 "scan.l"
-+#line 741 "scan.l"
- bracelevel = 0;
- 	YY_BREAK
--case 180:
-+case 183:
- YY_RULE_SETUP
--#line 737 "scan.l"
-+#line 743 "scan.l"
- ACTION_ECHO; yy_push_state( COMMENT );
- 	YY_BREAK
- 
--case 181:
-+case 184:
- YY_RULE_SETUP
--#line 740 "scan.l"
-+#line 746 "scan.l"
- {
- 			ACTION_ECHO;
- 			CHECK_REJECT(yytext);
- 			}
- 	YY_BREAK
--case 182:
-+case 185:
- YY_RULE_SETUP
--#line 744 "scan.l"
-+#line 750 "scan.l"
- {
- 			ACTION_ECHO;
- 			CHECK_YYMORE(yytext);
- 			}
- 	YY_BREAK
- 
--case 183:
-+case 186:
- YY_RULE_SETUP
--#line 750 "scan.l"
-+#line 756 "scan.l"
- ACTION_ECHO;
- 	YY_BREAK
--case 184:
--/* rule 184 can match eol */
-+case 187:
-+/* rule 187 can match eol */
- YY_RULE_SETUP
--#line 751 "scan.l"
-+#line 757 "scan.l"
- {
- 			++linenum;
- 			ACTION_ECHO;
-@@ -3214,40 +3252,40 @@
- 
- /* Reject and YYmore() are checked for above, in PERCENT_BRACE_ACTION */
- 
--case 185:
-+case 188:
- YY_RULE_SETUP
--#line 769 "scan.l"
-+#line 775 "scan.l"
- ACTION_ECHO; ++bracelevel;
- 	YY_BREAK
--case 186:
-+case 189:
- YY_RULE_SETUP
--#line 770 "scan.l"
-+#line 776 "scan.l"
- ACTION_ECHO; --bracelevel;
- 	YY_BREAK
--case 187:
-+case 190:
- YY_RULE_SETUP
--#line 771 "scan.l"
-+#line 777 "scan.l"
- ACTION_ECHO;
- 	YY_BREAK
--case 188:
-+case 191:
- YY_RULE_SETUP
--#line 772 "scan.l"
-+#line 778 "scan.l"
- ACTION_ECHO;
- 	YY_BREAK
--case 189:
-+case 192:
- YY_RULE_SETUP
--#line 773 "scan.l"
-+#line 779 "scan.l"
- ACTION_ECHO; /* character constant */
- 	YY_BREAK
--case 190:
-+case 193:
- YY_RULE_SETUP
--#line 774 "scan.l"
-+#line 780 "scan.l"
- ACTION_ECHO; BEGIN(ACTION_STRING);
- 	YY_BREAK
--case 191:
--/* rule 191 can match eol */
-+case 194:
-+/* rule 194 can match eol */
- YY_RULE_SETUP
--#line 775 "scan.l"
-+#line 781 "scan.l"
- {
- 			++linenum;
- 			ACTION_ECHO;
-@@ -3261,52 +3299,52 @@
- 				}
- 			}
- 	YY_BREAK
--case 192:
-+case 195:
- YY_RULE_SETUP
--#line 787 "scan.l"
-+#line 793 "scan.l"
- ACTION_ECHO;
- 	YY_BREAK
- 
- 
--case 193:
-+case 196:
- YY_RULE_SETUP
--#line 791 "scan.l"
-+#line 797 "scan.l"
- ACTION_ECHO;
- 	YY_BREAK
--case 194:
-+case 197:
- YY_RULE_SETUP
--#line 792 "scan.l"
-+#line 798 "scan.l"
- ACTION_ECHO;
- 	YY_BREAK
--case 195:
--/* rule 195 can match eol */
-+case 198:
-+/* rule 198 can match eol */
- YY_RULE_SETUP
--#line 793 "scan.l"
-+#line 799 "scan.l"
- ++linenum; ACTION_ECHO; BEGIN(ACTION);
- 	YY_BREAK
--case 196:
-+case 199:
- YY_RULE_SETUP
--#line 794 "scan.l"
-+#line 800 "scan.l"
- ACTION_ECHO; BEGIN(ACTION);
- 	YY_BREAK
--case 197:
-+case 200:
- YY_RULE_SETUP
--#line 795 "scan.l"
-+#line 801 "scan.l"
- ACTION_ECHO;
- 	YY_BREAK
- 
- case YY_STATE_EOF(COMMENT):
- case YY_STATE_EOF(ACTION):
- case YY_STATE_EOF(ACTION_STRING):
--#line 798 "scan.l"
-+#line 804 "scan.l"
- {
- 			synerr( _( "EOF encountered inside an action" ) );
- 			yyterminate();
- 			}
- 	YY_BREAK
--case 198:
-+case 201:
- YY_RULE_SETUP
--#line 804 "scan.l"
-+#line 810 "scan.l"
- {
- 			yylval = myesc( (Char *) yytext );
- 
-@@ -3317,29 +3355,29 @@
- 			}
- 	YY_BREAK
- 
--case 199:
--/* rule 199 can match eol */
-+case 202:
-+/* rule 202 can match eol */
- YY_RULE_SETUP
--#line 815 "scan.l"
-+#line 821 "scan.l"
- ECHO;
- 	YY_BREAK
- case YY_STATE_EOF(SECT3):
--#line 816 "scan.l"
-+#line 822 "scan.l"
- sectnum = 0; yyterminate();
- 	YY_BREAK
- 
--case 200:
--/* rule 200 can match eol */
-+case 203:
-+/* rule 203 can match eol */
- YY_RULE_SETUP
--#line 819 "scan.l"
-+#line 825 "scan.l"
- format_synerr( _( "bad character: %s" ), yytext );
- 	YY_BREAK
--case 201:
-+case 204:
- YY_RULE_SETUP
--#line 821 "scan.l"
-+#line 827 "scan.l"
- YY_FATAL_ERROR( "flex scanner jammed" );
- 	YY_BREAK
--#line 3343 "scan.c"
-+#line 3381 "scan.c"
- case YY_STATE_EOF(INITIAL):
- case YY_STATE_EOF(SECT2):
- case YY_STATE_EOF(CODEBLOCK):
-@@ -3637,7 +3675,7 @@
- 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
- 			{
- 			yy_current_state = (int) yy_def[yy_current_state];
--			if ( yy_current_state >= 973 )
-+			if ( yy_current_state >= 977 )
- 				yy_c = yy_meta[(unsigned int) yy_c];
- 			}
- 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-@@ -3665,11 +3703,11 @@
- 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
- 		{
- 		yy_current_state = (int) yy_def[yy_current_state];
--		if ( yy_current_state >= 973 )
-+		if ( yy_current_state >= 977 )
- 			yy_c = yy_meta[(unsigned int) yy_c];
- 		}
- 	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
--	yy_is_jam = (yy_current_state == 972);
-+	yy_is_jam = (yy_current_state == 976);
- 
- 	return yy_is_jam ? 0 : yy_current_state;
- }
-@@ -4093,10 +4131,10 @@
-  * @note If you want to scan bytes that may contain NUL values, then use
-  *       yy_scan_bytes() instead.
-  */
--YY_BUFFER_STATE yy_scan_string (yyconst char * str )
-+YY_BUFFER_STATE yy_scan_string (yyconst char * yy_str )
- {
-     
--	return yy_scan_bytes(str,strlen(str) );
-+	return yy_scan_bytes(yy_str,strlen(yy_str) );
- }
- 
- /** Setup the input buffer state to scan the given bytes. The next call to yylex() will
-@@ -4358,7 +4396,7 @@
- #undef YY_DECL_IS_OURS
- #undef YY_DECL
- #endif
--#line 821 "scan.l"
-+#line 827 "scan.l"
- 
- 
- 
-diff -Naur flex-2.5.31.orig/scan.l flex-2.5.31/scan.l
---- flex-2.5.31.orig/scan.l	2003-04-01 01:51:38.000000000 +0000
-+++ flex-2.5.31/scan.l	2005-01-08 07:43:02.027872832 +0000
-@@ -194,8 +194,14 @@
- <COMMENT>{
- 	"*/"		ACTION_ECHO; yy_pop_state();
- 	"*"		ACTION_ECHO;
--	[^*\n]+		ACTION_ECHO;
--	[^*\n]*{NL}	++linenum; ACTION_ECHO;
-+	[\[\]]		ACTION_ECHO;
-+	[^*\[\]\n]+	ACTION_ECHO;
-+	[^*\[\]\n]*{NL}	++linenum; ACTION_ECHO;
-+	\[\[		add_action("[" "[]" "]m4_" "userquote_start()");
-+	\]\]		add_action("[" "[]" "]m4_" "userquote_end()");
-+			/* Macros need to be clearly separated from surrounding
-+			 * text and this file needs to go through flex untouched.
-+			 */
- }
- 
- <LINEDIR>{
-diff -Naur flex-2.5.31.orig/skel.c flex-2.5.31/skel.c
---- flex-2.5.31.orig/skel.c	2003-04-01 16:33:08.000000000 +0000
-+++ flex-2.5.31/skel.c	2005-01-08 07:43:02.049869488 +0000
-@@ -404,16 +404,16 @@
-   "%#        yyscan_t yyscanner;",
-   "%#",
-   "%# Generate traditional function defs",
--  "    m4_define( [[YYFARGS0]], [[(M4_YY_DEF_ONLY_ARG)",
-+  "    m4_define( [[YYFARGS0]], [[(M4_YY_DEF_ONLY_ARG) [[\\]]",
-   "        M4_YY_DECL_LAST_ARG]])",
--  "    m4_define( [[YYFARGS1]], [[($2 M4_YY_DEF_LAST_ARG)",
-+  "    m4_define( [[YYFARGS1]], [[($2 M4_YY_DEF_LAST_ARG) [[\\]]",
-   "        $1 $2;",
-   "        M4_YY_DECL_LAST_ARG]])",
--  "    m4_define( [[YYFARGS2]], [[($2,$4 M4_YY_DEF_LAST_ARG)",
-+  "    m4_define( [[YYFARGS2]], [[($2,$4 M4_YY_DEF_LAST_ARG) [[\\]]",
-   "        $1 $2;",
-   "        $3 $4;",
-   "        M4_YY_DECL_LAST_ARG]])",
--  "    m4_define( [[YYFARGS3]], [[($2,$4,$6 M4_YY_DEF_LAST_ARG)",
-+  "    m4_define( [[YYFARGS3]], [[($2,$4,$6 M4_YY_DEF_LAST_ARG) [[\\]]",
-   "        $1 $2;",
-   "        $3 $4;",
-   "        $5 $6;",
-@@ -783,6 +783,7 @@
-   "",
-   "m4_ifdef( [[M4_YY_NO_UNISTD_H]],,",
-   "[[",
-+  "#ifndef YY_NO_UNISTD_H",
-   "/* Special case for \"unistd.h\", since it is non-ANSI. We include it way",
-   " * down here because we want the user's section 1 to have been scanned first.",
-   " * The user has a chance to override it with an option.",
-@@ -793,6 +794,7 @@
-   "%if-c++-only",
-   "#include <unistd.h>",
-   "%endif",
-+  "#endif",
-   "]])",
-   "",
-   "#ifndef YY_EXTRA_TYPE",
-@@ -2454,11 +2456,11 @@
-   " * @note If you want to scan bytes that may contain NUL values, then use",
-   " *       yy_scan_bytes() instead.",
-   " */",
--  "YY_BUFFER_STATE yy_scan_string YYFARGS1( yyconst char *,str)",
-+  "YY_BUFFER_STATE yy_scan_string YYFARGS1( yyconst char *,yy_str)",
-   "{",
-   "    m4_dnl M4_YY_DECL_GUTS_VAR();",
-   "",
--  "	return yy_scan_bytes( str, strlen(str) M4_YY_CALL_LAST_ARG);",
-+  "	return yy_scan_bytes( yy_str, strlen(yy_str) M4_YY_CALL_LAST_ARG);",
-   "}",
-   "%endif",
-   "]])",
-diff -Naur flex-2.5.31.orig/tests/Makefile.in flex-2.5.31/tests/Makefile.in
---- flex-2.5.31.orig/tests/Makefile.in	2003-04-01 16:32:36.000000000 +0000
-+++ flex-2.5.31/tests/Makefile.in	2005-01-08 07:43:02.079864928 +0000
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.7 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # @configure_input@
- 
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -42,7 +42,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -57,6 +56,31 @@
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
- host_triplet = @host@
-+subdir = tests
-+DIST_COMMON = README $(dist_noinst_SCRIPTS) $(srcdir)/Makefile.am \
-+	$(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
-+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SCRIPTS = $(dist_noinst_SCRIPTS)
-+SOURCES =
-+DIST_SOURCES =
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+	html-recursive info-recursive install-data-recursive \
-+	install-exec-recursive install-info-recursive \
-+	install-recursive installcheck-recursive installdirs-recursive \
-+	pdf-recursive ps-recursive uninstall-info-recursive \
-+	uninstall-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -96,12 +120,16 @@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
- LIBICONV = @LIBICONV@
- LIBINTL = @LIBINTL@
-+LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LN_S = @LN_S@
- LTLIBICONV = @LTLIBICONV@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- M4 = @M4@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
-@@ -132,6 +160,7 @@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
- am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
- bindir = @bindir@
- build = @build@
-@@ -153,6 +182,7 @@
- libexecdir = @libexecdir@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-@@ -160,15 +190,12 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--
- EXTRA_DIST = \
- 	README
- 
--
- dist_noinst_SCRIPTS = \
- 	create-test
- 
--
- DIST_SUBDIRS = \
- 	test-basic-nr \
- 	test-basic-r \
-@@ -210,7 +237,6 @@
- 	test-noansi-r \
- 	test-table-opts
- 
--
- SUBDIRS = \
- 	test-basic-nr \
- 	test-basic-r \
-@@ -251,28 +277,38 @@
- 	test-top \
- 	test-table-opts
- 
--subdir = tests
--mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--SCRIPTS = $(dist_noinst_SCRIPTS)
--
--DIST_SOURCES =
--
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--	ps-recursive install-info-recursive uninstall-info-recursive \
--	all-recursive install-data-recursive install-exec-recursive \
--	installdirs-recursive install-recursive uninstall-recursive \
--	check-recursive installcheck-recursive
--DIST_COMMON = README $(dist_noinst_SCRIPTS) Makefile.am Makefile.in
- all: all-recursive
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tests/Makefile'; \
- 	cd $(top_srcdir) && \
- 	  $(AUTOMAKE) --gnu  tests/Makefile
--Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- uninstall-info-am:
- 
- # This directory's subdirectories are mostly independent; you can cd
-@@ -334,14 +370,6 @@
- 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- 	done
- 
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
-@@ -350,14 +378,23 @@
- 	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
- 	mkid -fID $$unique
-+tags: TAGS
- 
- TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
- 		$(TAGS_FILES) $(LISP)
- 	tags=; \
- 	here=`pwd`; \
-+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-+	  include_option=--etags-include; \
-+	  empty_fix=.; \
-+	else \
-+	  include_option=--include; \
-+	  empty_fix=; \
-+	fi; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
--	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-+	    test ! -f $$subdir/TAGS || \
-+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- 	  fi; \
- 	done; \
- 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-@@ -366,10 +403,11 @@
- 	  done | \
- 	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$tags$$unique" \
--	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
--	     $$tags $$unique
--
-+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	    $$tags $$unique; \
-+	fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
- 		$(TAGS_FILES) $(LISP)
-@@ -392,22 +430,20 @@
- 
- distclean-tags:
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--
--top_distdir = ..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
- 
- distdir: $(DISTFILES)
- 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- 	list='$(DISTFILES)'; for file in $$list; do \
- 	  case $$file in \
- 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- 	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- 	    dir="/$$dir"; \
--	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
- 	  else \
- 	    dir=''; \
- 	  fi; \
-@@ -424,13 +460,13 @@
- 	done
- 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
--	    test -d $(distdir)/$$subdir \
--	    || mkdir $(distdir)/$$subdir \
-+	    test -d "$(distdir)/$$subdir" \
-+	    || mkdir "$(distdir)/$$subdir" \
- 	    || exit 1; \
- 	    (cd $$subdir && \
- 	      $(MAKE) $(AM_MAKEFLAGS) \
--	        top_distdir="$(top_distdir)" \
--	        distdir=../$(distdir)/$$subdir \
-+	        top_distdir="../$(top_distdir)" \
-+	        distdir="../$(distdir)/$$subdir" \
- 	        distdir) \
- 	      || exit 1; \
- 	  fi; \
-@@ -441,7 +477,6 @@
- all-am: Makefile $(SCRIPTS)
- installdirs: installdirs-recursive
- installdirs-am:
--
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -453,7 +488,7 @@
- installcheck: installcheck-recursive
- install-strip:
- 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
--	  INSTALL_STRIP_FLAG=-s \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- 	  `test -z '$(STRIP)' || \
- 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
-@@ -461,7 +496,7 @@
- clean-generic:
- 
- distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+	-rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
- 	@echo "This command is intended for maintainers to use"
-@@ -471,13 +506,15 @@
- clean-am: clean-generic mostlyclean-am
- 
- distclean: distclean-recursive
--
-+	-rm -f Makefile
- distclean-am: clean-am distclean-generic distclean-tags
- 
- dvi: dvi-recursive
- 
- dvi-am:
- 
-+html: html-recursive
-+
- info: info-recursive
- 
- info-am:
-@@ -493,7 +530,7 @@
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-recursive
--
-+	-rm -f Makefile
- maintainer-clean-am: distclean-am maintainer-clean-generic
- 
- mostlyclean: mostlyclean-recursive
-@@ -514,19 +551,16 @@
- 
- .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
- 	check-local clean clean-generic clean-recursive ctags \
--	ctags-recursive distclean distclean-generic distclean-recursive \
--	distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
--	info-recursive install install-am install-data install-data-am \
--	install-data-recursive install-exec install-exec-am \
--	install-exec-recursive install-info install-info-am \
--	install-info-recursive install-man install-recursive \
--	install-strip installcheck installcheck-am installdirs \
--	installdirs-am installdirs-recursive maintainer-clean \
--	maintainer-clean-generic maintainer-clean-recursive mostlyclean \
--	mostlyclean-generic mostlyclean-recursive pdf pdf-am \
--	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
--	uninstall uninstall-am uninstall-info-am \
--	uninstall-info-recursive uninstall-recursive
-+	ctags-recursive distclean distclean-generic \
-+	distclean-recursive distclean-tags distdir dvi dvi-am html \
-+	html-am info info-am install install-am install-data \
-+	install-data-am install-exec install-exec-am install-info \
-+	install-info-am install-man install-strip installcheck \
-+	installcheck-am installdirs installdirs-am maintainer-clean \
-+	maintainer-clean-generic maintainer-clean-recursive \
-+	mostlyclean mostlyclean-generic mostlyclean-recursive pdf \
-+	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-+	uninstall-info-am
- 
- 
- # clean up before running the test suite so we dont test old builds of test code
-diff -Naur flex-2.5.31.orig/tests/TEMPLATE/Makefile.in flex-2.5.31/tests/TEMPLATE/Makefile.in
---- flex-2.5.31.orig/tests/TEMPLATE/Makefile.in	2003-04-01 16:32:37.000000000 +0000
-+++ flex-2.5.31/tests/TEMPLATE/Makefile.in	2005-01-08 07:43:02.093862800 +0000
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.7 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # @configure_input@
- 
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -34,7 +34,6 @@
- # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- # PURPOSE.
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -42,7 +41,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -57,6 +55,21 @@
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
- host_triplet = @host@
-+subdir = tests/TEMPLATE
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
-+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -96,12 +109,16 @@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
- LIBICONV = @LIBICONV@
- LIBINTL = @LIBINTL@
-+LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LN_S = @LN_S@
- LTLIBICONV = @LTLIBICONV@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- M4 = @M4@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
-@@ -132,6 +149,7 @@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
- am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
- bindir = @bindir@
- build = @build@
-@@ -153,6 +171,7 @@
- libexecdir = @libexecdir@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-@@ -160,36 +179,49 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--
- FLEX = $(top_builddir)/flex
--
- builddir = @builddir@
--
- EXTRA_DIST = scanner.l parser.y test.input
- CLEANFILES = scanner.c scanner.h parser.c parser.h TEMPLATE OUTPUT $(OBJS)
- OBJS = scanner.o # parser.o
--
- AM_CPPFLAGS = -I$(srcdir) -I$(builddir) -I$(top_srcdir) -I$(top_builddir)
--
- #LDFLAGS = $(top_srcdir)/libfl.a 
- #LFLAGS = --header="scanner.h"
- #YFLAGS = --defines --output=parser.c
- testname = TEMPLATE
--subdir = tests/TEMPLATE
--mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--DIST_COMMON = Makefile.am Makefile.in
- all: all-am
- 
- .SUFFIXES:
- .SUFFIXES: .c .o
--$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tests/TEMPLATE/Makefile'; \
- 	cd $(top_srcdir) && \
- 	  $(AUTOMAKE) --gnu  tests/TEMPLATE/Makefile
--Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- uninstall-info-am:
- tags: TAGS
- TAGS:
-@@ -197,22 +229,20 @@
- ctags: CTAGS
- CTAGS:
- 
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
- 
- distdir: $(DISTFILES)
- 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- 	list='$(DISTFILES)'; for file in $$list; do \
- 	  case $$file in \
- 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- 	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- 	    dir="/$$dir"; \
--	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
- 	  else \
- 	    dir=''; \
- 	  fi; \
-@@ -230,9 +260,7 @@
- check-am: all-am
- check: check-am
- all-am: Makefile
--
- installdirs:
--
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -244,7 +272,7 @@
- installcheck: installcheck-am
- install-strip:
- 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
--	  INSTALL_STRIP_FLAG=-s \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- 	  `test -z '$(STRIP)' || \
- 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
-@@ -253,7 +281,7 @@
- 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
- 
- distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+	-rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
- 	@echo "This command is intended for maintainers to use"
-@@ -263,13 +291,15 @@
- clean-am: clean-generic mostlyclean-am
- 
- distclean: distclean-am
--
-+	-rm -f Makefile
- distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
- dvi-am:
- 
-+html: html-am
-+
- info: info-am
- 
- info-am:
-@@ -285,7 +315,7 @@
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
--
-+	-rm -f Makefile
- maintainer-clean-am: distclean-am maintainer-clean-generic
- 
- mostlyclean: mostlyclean-am
-@@ -303,8 +333,8 @@
- uninstall-am: uninstall-info-am
- 
- .PHONY: all all-am check check-am clean clean-generic distclean \
--	distclean-generic distdir dvi dvi-am info info-am install \
--	install-am install-data install-data-am install-exec \
-+	distclean-generic distdir dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am install-exec \
- 	install-exec-am install-info install-info-am install-man \
- 	install-strip installcheck installcheck-am installdirs \
- 	maintainer-clean maintainer-clean-generic mostlyclean \
-diff -Naur flex-2.5.31.orig/tests/test-array-nr/Makefile.in flex-2.5.31/tests/test-array-nr/Makefile.in
---- flex-2.5.31.orig/tests/test-array-nr/Makefile.in	2003-04-01 16:32:37.000000000 +0000
-+++ flex-2.5.31/tests/test-array-nr/Makefile.in	2005-01-08 07:43:02.106860824 +0000
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.7 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # @configure_input@
- 
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -34,7 +34,6 @@
- # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- # PURPOSE.
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -42,7 +41,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -57,6 +55,21 @@
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
- host_triplet = @host@
-+subdir = tests/test-array-nr
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
-+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -96,12 +109,16 @@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
- LIBICONV = @LIBICONV@
- LIBINTL = @LIBINTL@
-+LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LN_S = @LN_S@
- LTLIBICONV = @LTLIBICONV@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- M4 = @M4@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
-@@ -132,6 +149,7 @@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
- am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
- bindir = @bindir@
- build = @build@
-@@ -153,6 +171,7 @@
- libexecdir = @libexecdir@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-@@ -160,33 +179,47 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--
- FLEX = $(top_builddir)/flex
--
- EXTRA_DIST = scanner.l test.input
- CLEANFILES = scanner.c parser.c parser.h test-array-nr OUTPUT $(OBJS)
- OBJS = scanner.o # parser.o
--
- AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)
--
- #LDFLAGS = $(top_srcdir)/libfl.a 
- #YFLAGS = --defines --output=parser.c
- testname = test-array-nr
--subdir = tests/test-array-nr
--mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--DIST_COMMON = Makefile.am Makefile.in
- all: all-am
- 
- .SUFFIXES:
- .SUFFIXES: .c .o
--$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tests/test-array-nr/Makefile'; \
- 	cd $(top_srcdir) && \
- 	  $(AUTOMAKE) --gnu  tests/test-array-nr/Makefile
--Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- uninstall-info-am:
- tags: TAGS
- TAGS:
-@@ -194,22 +227,20 @@
- ctags: CTAGS
- CTAGS:
- 
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
- 
- distdir: $(DISTFILES)
- 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- 	list='$(DISTFILES)'; for file in $$list; do \
- 	  case $$file in \
- 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- 	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- 	    dir="/$$dir"; \
--	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
- 	  else \
- 	    dir=''; \
- 	  fi; \
-@@ -227,9 +258,7 @@
- check-am: all-am
- check: check-am
- all-am: Makefile
--
- installdirs:
--
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -241,7 +270,7 @@
- installcheck: installcheck-am
- install-strip:
- 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
--	  INSTALL_STRIP_FLAG=-s \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- 	  `test -z '$(STRIP)' || \
- 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
-@@ -250,7 +279,7 @@
- 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
- 
- distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+	-rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
- 	@echo "This command is intended for maintainers to use"
-@@ -260,13 +289,15 @@
- clean-am: clean-generic mostlyclean-am
- 
- distclean: distclean-am
--
-+	-rm -f Makefile
- distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
- dvi-am:
- 
-+html: html-am
-+
- info: info-am
- 
- info-am:
-@@ -282,7 +313,7 @@
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
--
-+	-rm -f Makefile
- maintainer-clean-am: distclean-am maintainer-clean-generic
- 
- mostlyclean: mostlyclean-am
-@@ -300,8 +331,8 @@
- uninstall-am: uninstall-info-am
- 
- .PHONY: all all-am check check-am clean clean-generic distclean \
--	distclean-generic distdir dvi dvi-am info info-am install \
--	install-am install-data install-data-am install-exec \
-+	distclean-generic distdir dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am install-exec \
- 	install-exec-am install-info install-info-am install-man \
- 	install-strip installcheck installcheck-am installdirs \
- 	maintainer-clean maintainer-clean-generic mostlyclean \
-diff -Naur flex-2.5.31.orig/tests/test-array-r/Makefile.in flex-2.5.31/tests/test-array-r/Makefile.in
---- flex-2.5.31.orig/tests/test-array-r/Makefile.in	2003-04-01 16:32:37.000000000 +0000
-+++ flex-2.5.31/tests/test-array-r/Makefile.in	2005-01-08 07:43:02.119858848 +0000
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.7 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # @configure_input@
- 
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -34,7 +34,6 @@
- # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- # PURPOSE.
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -42,7 +41,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -57,6 +55,21 @@
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
- host_triplet = @host@
-+subdir = tests/test-array-r
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
-+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -96,12 +109,16 @@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
- LIBICONV = @LIBICONV@
- LIBINTL = @LIBINTL@
-+LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LN_S = @LN_S@
- LTLIBICONV = @LTLIBICONV@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- M4 = @M4@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
-@@ -132,6 +149,7 @@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
- am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
- bindir = @bindir@
- build = @build@
-@@ -153,6 +171,7 @@
- libexecdir = @libexecdir@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-@@ -160,33 +179,47 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--
- FLEX = $(top_builddir)/flex
--
- EXTRA_DIST = scanner.l test.input
- CLEANFILES = scanner.c test-array-r OUTPUT $(OBJS)
- OBJS = scanner.o
--
- AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)
--
- #LDFLAGS = $(top_srcdir)/libfl.a 
- #YFLAGS = --defines --output=parser.c
- testname = test-array-r
--subdir = tests/test-array-r
--mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--DIST_COMMON = Makefile.am Makefile.in
- all: all-am
- 
- .SUFFIXES:
- .SUFFIXES: .c .o
--$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tests/test-array-r/Makefile'; \
- 	cd $(top_srcdir) && \
- 	  $(AUTOMAKE) --gnu  tests/test-array-r/Makefile
--Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- uninstall-info-am:
- tags: TAGS
- TAGS:
-@@ -194,22 +227,20 @@
- ctags: CTAGS
- CTAGS:
- 
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
- 
- distdir: $(DISTFILES)
- 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- 	list='$(DISTFILES)'; for file in $$list; do \
- 	  case $$file in \
- 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- 	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- 	    dir="/$$dir"; \
--	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
- 	  else \
- 	    dir=''; \
- 	  fi; \
-@@ -227,9 +258,7 @@
- check-am: all-am
- check: check-am
- all-am: Makefile
--
- installdirs:
--
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -241,7 +270,7 @@
- installcheck: installcheck-am
- install-strip:
- 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
--	  INSTALL_STRIP_FLAG=-s \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- 	  `test -z '$(STRIP)' || \
- 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
-@@ -250,7 +279,7 @@
- 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
- 
- distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+	-rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
- 	@echo "This command is intended for maintainers to use"
-@@ -260,13 +289,15 @@
- clean-am: clean-generic mostlyclean-am
- 
- distclean: distclean-am
--
-+	-rm -f Makefile
- distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
- dvi-am:
- 
-+html: html-am
-+
- info: info-am
- 
- info-am:
-@@ -282,7 +313,7 @@
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
--
-+	-rm -f Makefile
- maintainer-clean-am: distclean-am maintainer-clean-generic
- 
- mostlyclean: mostlyclean-am
-@@ -300,8 +331,8 @@
- uninstall-am: uninstall-info-am
- 
- .PHONY: all all-am check check-am clean clean-generic distclean \
--	distclean-generic distdir dvi dvi-am info info-am install \
--	install-am install-data install-data-am install-exec \
-+	distclean-generic distdir dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am install-exec \
- 	install-exec-am install-info install-info-am install-man \
- 	install-strip installcheck installcheck-am installdirs \
- 	maintainer-clean maintainer-clean-generic mostlyclean \
-diff -Naur flex-2.5.31.orig/tests/test-basic-nr/Makefile.in flex-2.5.31/tests/test-basic-nr/Makefile.in
---- flex-2.5.31.orig/tests/test-basic-nr/Makefile.in	2003-04-01 16:32:37.000000000 +0000
-+++ flex-2.5.31/tests/test-basic-nr/Makefile.in	2005-01-08 07:43:02.133856720 +0000
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.7 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # @configure_input@
- 
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -34,7 +34,6 @@
- # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- # PURPOSE.
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -42,7 +41,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -57,6 +55,21 @@
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
- host_triplet = @host@
-+subdir = tests/test-basic-nr
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
-+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -96,12 +109,16 @@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
- LIBICONV = @LIBICONV@
- LIBINTL = @LIBINTL@
-+LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LN_S = @LN_S@
- LTLIBICONV = @LTLIBICONV@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- M4 = @M4@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
-@@ -132,6 +149,7 @@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
- am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
- bindir = @bindir@
- build = @build@
-@@ -153,6 +171,7 @@
- libexecdir = @libexecdir@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-@@ -160,33 +179,47 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--
- FLEX = $(top_builddir)/flex
--
- EXTRA_DIST = scanner.l test.input
- CLEANFILES = scanner.c parser.c parser.h test-basic-nr OUTPUT $(OBJS)
- OBJS = scanner.o # parser.o
--
- AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)
--
- #LDFLAGS = $(top_srcdir)/libfl.a 
- #YFLAGS = --defines --output=parser.c
- testname = test-basic-nr
--subdir = tests/test-basic-nr
--mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--DIST_COMMON = Makefile.am Makefile.in
- all: all-am
- 
- .SUFFIXES:
- .SUFFIXES: .c .o
--$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tests/test-basic-nr/Makefile'; \
- 	cd $(top_srcdir) && \
- 	  $(AUTOMAKE) --gnu  tests/test-basic-nr/Makefile
--Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- uninstall-info-am:
- tags: TAGS
- TAGS:
-@@ -194,22 +227,20 @@
- ctags: CTAGS
- CTAGS:
- 
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
- 
- distdir: $(DISTFILES)
- 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- 	list='$(DISTFILES)'; for file in $$list; do \
- 	  case $$file in \
- 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- 	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- 	    dir="/$$dir"; \
--	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
- 	  else \
- 	    dir=''; \
- 	  fi; \
-@@ -227,9 +258,7 @@
- check-am: all-am
- check: check-am
- all-am: Makefile
--
- installdirs:
--
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -241,7 +270,7 @@
- installcheck: installcheck-am
- install-strip:
- 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
--	  INSTALL_STRIP_FLAG=-s \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- 	  `test -z '$(STRIP)' || \
- 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
-@@ -250,7 +279,7 @@
- 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
- 
- distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+	-rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
- 	@echo "This command is intended for maintainers to use"
-@@ -260,13 +289,15 @@
- clean-am: clean-generic mostlyclean-am
- 
- distclean: distclean-am
--
-+	-rm -f Makefile
- distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
- dvi-am:
- 
-+html: html-am
-+
- info: info-am
- 
- info-am:
-@@ -282,7 +313,7 @@
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
--
-+	-rm -f Makefile
- maintainer-clean-am: distclean-am maintainer-clean-generic
- 
- mostlyclean: mostlyclean-am
-@@ -300,8 +331,8 @@
- uninstall-am: uninstall-info-am
- 
- .PHONY: all all-am check check-am clean clean-generic distclean \
--	distclean-generic distdir dvi dvi-am info info-am install \
--	install-am install-data install-data-am install-exec \
-+	distclean-generic distdir dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am install-exec \
- 	install-exec-am install-info install-info-am install-man \
- 	install-strip installcheck installcheck-am installdirs \
- 	maintainer-clean maintainer-clean-generic mostlyclean \
-diff -Naur flex-2.5.31.orig/tests/test-basic-r/Makefile.in flex-2.5.31/tests/test-basic-r/Makefile.in
---- flex-2.5.31.orig/tests/test-basic-r/Makefile.in	2003-04-01 16:32:38.000000000 +0000
-+++ flex-2.5.31/tests/test-basic-r/Makefile.in	2005-01-08 07:43:02.146854744 +0000
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.7 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # @configure_input@
- 
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -34,7 +34,6 @@
- # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- # PURPOSE.
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -42,7 +41,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -57,6 +55,21 @@
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
- host_triplet = @host@
-+subdir = tests/test-basic-r
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
-+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -96,12 +109,16 @@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
- LIBICONV = @LIBICONV@
- LIBINTL = @LIBINTL@
-+LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LN_S = @LN_S@
- LTLIBICONV = @LTLIBICONV@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- M4 = @M4@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
-@@ -132,6 +149,7 @@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
- am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
- bindir = @bindir@
- build = @build@
-@@ -153,6 +171,7 @@
- libexecdir = @libexecdir@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-@@ -160,33 +179,47 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--
- FLEX = $(top_builddir)/flex
--
- EXTRA_DIST = scanner.l test.input
- CLEANFILES = scanner.c parser.c parser.h test-basic-r OUTPUT $(OBJS)
- OBJS = scanner.o # parser.o
--
- AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)
--
- #LDFLAGS = $(top_srcdir)/libfl.a 
- #YFLAGS = --defines --output=parser.c
- testname = test-basic-r
--subdir = tests/test-basic-r
--mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--DIST_COMMON = Makefile.am Makefile.in
- all: all-am
- 
- .SUFFIXES:
- .SUFFIXES: .c .o
--$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tests/test-basic-r/Makefile'; \
- 	cd $(top_srcdir) && \
- 	  $(AUTOMAKE) --gnu  tests/test-basic-r/Makefile
--Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- uninstall-info-am:
- tags: TAGS
- TAGS:
-@@ -194,22 +227,20 @@
- ctags: CTAGS
- CTAGS:
- 
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
- 
- distdir: $(DISTFILES)
- 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- 	list='$(DISTFILES)'; for file in $$list; do \
- 	  case $$file in \
- 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- 	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- 	    dir="/$$dir"; \
--	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
- 	  else \
- 	    dir=''; \
- 	  fi; \
-@@ -227,9 +258,7 @@
- check-am: all-am
- check: check-am
- all-am: Makefile
--
- installdirs:
--
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -241,7 +270,7 @@
- installcheck: installcheck-am
- install-strip:
- 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
--	  INSTALL_STRIP_FLAG=-s \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- 	  `test -z '$(STRIP)' || \
- 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
-@@ -250,7 +279,7 @@
- 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
- 
- distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+	-rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
- 	@echo "This command is intended for maintainers to use"
-@@ -260,13 +289,15 @@
- clean-am: clean-generic mostlyclean-am
- 
- distclean: distclean-am
--
-+	-rm -f Makefile
- distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
- dvi-am:
- 
-+html: html-am
-+
- info: info-am
- 
- info-am:
-@@ -282,7 +313,7 @@
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
--
-+	-rm -f Makefile
- maintainer-clean-am: distclean-am maintainer-clean-generic
- 
- mostlyclean: mostlyclean-am
-@@ -300,8 +331,8 @@
- uninstall-am: uninstall-info-am
- 
- .PHONY: all all-am check check-am clean clean-generic distclean \
--	distclean-generic distdir dvi dvi-am info info-am install \
--	install-am install-data install-data-am install-exec \
-+	distclean-generic distdir dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am install-exec \
- 	install-exec-am install-info install-info-am install-man \
- 	install-strip installcheck installcheck-am installdirs \
- 	maintainer-clean maintainer-clean-generic mostlyclean \
-diff -Naur flex-2.5.31.orig/tests/test-bison-nr/Makefile.in flex-2.5.31/tests/test-bison-nr/Makefile.in
---- flex-2.5.31.orig/tests/test-bison-nr/Makefile.in	2003-04-01 16:32:38.000000000 +0000
-+++ flex-2.5.31/tests/test-bison-nr/Makefile.in	2005-01-08 07:43:02.162852312 +0000
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.7 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # @configure_input@
- 
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -34,7 +34,6 @@
- # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- # PURPOSE.
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -42,7 +41,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -57,6 +55,21 @@
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
- host_triplet = @host@
-+subdir = tests/test-bison-nr
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
-+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -96,12 +109,16 @@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
- LIBICONV = @LIBICONV@
- LIBINTL = @LIBINTL@
-+LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LN_S = @LN_S@
- LTLIBICONV = @LTLIBICONV@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- M4 = @M4@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
-@@ -132,6 +149,7 @@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
- am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
- bindir = @bindir@
- build = @build@
-@@ -153,6 +171,7 @@
- libexecdir = @libexecdir@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-@@ -160,35 +179,48 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--
- FLEX = $(top_builddir)/flex
--
- builddir = @builddir@
--
- EXTRA_DIST = scanner.l parser.y test.input main.c
- CLEANFILES = scanner.c scanner.h parser.c parser.h test-bison-nr $(OBJS) OUTPUT
- OBJS = scanner.o parser.o main.o
--
- AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(builddir)
- #LDFLAGS = $(top_srcdir)/libfl.a 
- YFLAGS = --defines --output=parser.c --name-prefix="test"
--
- testname = test-bison-nr
--subdir = tests/test-bison-nr
--mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--DIST_COMMON = Makefile.am Makefile.in
- all: all-am
- 
- .SUFFIXES:
- .SUFFIXES: .c .o
--$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tests/test-bison-nr/Makefile'; \
- 	cd $(top_srcdir) && \
- 	  $(AUTOMAKE) --gnu  tests/test-bison-nr/Makefile
--Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- uninstall-info-am:
- tags: TAGS
- TAGS:
-@@ -196,22 +228,20 @@
- ctags: CTAGS
- CTAGS:
- 
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
- 
- distdir: $(DISTFILES)
- 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- 	list='$(DISTFILES)'; for file in $$list; do \
- 	  case $$file in \
- 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- 	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- 	    dir="/$$dir"; \
--	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
- 	  else \
- 	    dir=''; \
- 	  fi; \
-@@ -229,9 +259,7 @@
- check-am: all-am
- check: check-am
- all-am: Makefile
--
- installdirs:
--
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -243,7 +271,7 @@
- installcheck: installcheck-am
- install-strip:
- 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
--	  INSTALL_STRIP_FLAG=-s \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- 	  `test -z '$(STRIP)' || \
- 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
-@@ -252,7 +280,7 @@
- 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
- 
- distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+	-rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
- 	@echo "This command is intended for maintainers to use"
-@@ -262,13 +290,15 @@
- clean-am: clean-generic mostlyclean-am
- 
- distclean: distclean-am
--
-+	-rm -f Makefile
- distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
- dvi-am:
- 
-+html: html-am
-+
- info: info-am
- 
- info-am:
-@@ -284,7 +314,7 @@
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
--
-+	-rm -f Makefile
- maintainer-clean-am: distclean-am maintainer-clean-generic
- 
- mostlyclean: mostlyclean-am
-@@ -302,8 +332,8 @@
- uninstall-am: uninstall-info-am
- 
- .PHONY: all all-am check check-am clean clean-generic distclean \
--	distclean-generic distdir dvi dvi-am info info-am install \
--	install-am install-data install-data-am install-exec \
-+	distclean-generic distdir dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am install-exec \
- 	install-exec-am install-info install-info-am install-man \
- 	install-strip installcheck installcheck-am installdirs \
- 	maintainer-clean maintainer-clean-generic mostlyclean \
-diff -Naur flex-2.5.31.orig/tests/test-bison-yylloc/Makefile.in flex-2.5.31/tests/test-bison-yylloc/Makefile.in
---- flex-2.5.31.orig/tests/test-bison-yylloc/Makefile.in	2003-04-01 16:32:38.000000000 +0000
-+++ flex-2.5.31/tests/test-bison-yylloc/Makefile.in	2005-01-08 07:43:02.191847904 +0000
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.7 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # @configure_input@
- 
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -34,7 +34,6 @@
- # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- # PURPOSE.
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -42,7 +41,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -57,6 +55,21 @@
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
- host_triplet = @host@
-+subdir = tests/test-bison-yylloc
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
-+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -96,12 +109,16 @@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
- LIBICONV = @LIBICONV@
- LIBINTL = @LIBINTL@
-+LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LN_S = @LN_S@
- LTLIBICONV = @LTLIBICONV@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- M4 = @M4@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
-@@ -132,6 +149,7 @@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
- am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
- bindir = @bindir@
- build = @build@
-@@ -153,6 +171,7 @@
- libexecdir = @libexecdir@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-@@ -160,35 +179,48 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--
- FLEX = $(top_builddir)/flex
--
- builddir = @builddir@
--
- EXTRA_DIST = scanner.l parser.y test.input main.c
- CLEANFILES = scanner.c scanner.h parser.c parser.h test-bison-yylloc $(OBJS) OUTPUT
- OBJS = scanner.o parser.o main.o
--
- AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(builddir)
- #LDFLAGS = $(top_srcdir)/libfl.a 
- YFLAGS = --defines --output=parser.c --name-prefix="test"
--
- testname = test-bison-yylloc
--subdir = tests/test-bison-yylloc
--mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--DIST_COMMON = Makefile.am Makefile.in
- all: all-am
- 
- .SUFFIXES:
- .SUFFIXES: .c .o
--$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tests/test-bison-yylloc/Makefile'; \
- 	cd $(top_srcdir) && \
- 	  $(AUTOMAKE) --gnu  tests/test-bison-yylloc/Makefile
--Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- uninstall-info-am:
- tags: TAGS
- TAGS:
-@@ -196,22 +228,20 @@
- ctags: CTAGS
- CTAGS:
- 
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
- 
- distdir: $(DISTFILES)
- 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- 	list='$(DISTFILES)'; for file in $$list; do \
- 	  case $$file in \
- 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- 	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- 	    dir="/$$dir"; \
--	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
- 	  else \
- 	    dir=''; \
- 	  fi; \
-@@ -229,9 +259,7 @@
- check-am: all-am
- check: check-am
- all-am: Makefile
--
- installdirs:
--
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -243,7 +271,7 @@
- installcheck: installcheck-am
- install-strip:
- 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
--	  INSTALL_STRIP_FLAG=-s \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- 	  `test -z '$(STRIP)' || \
- 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
-@@ -252,7 +280,7 @@
- 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
- 
- distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+	-rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
- 	@echo "This command is intended for maintainers to use"
-@@ -262,13 +290,15 @@
- clean-am: clean-generic mostlyclean-am
- 
- distclean: distclean-am
--
-+	-rm -f Makefile
- distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
- dvi-am:
- 
-+html: html-am
-+
- info: info-am
- 
- info-am:
-@@ -284,7 +314,7 @@
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
--
-+	-rm -f Makefile
- maintainer-clean-am: distclean-am maintainer-clean-generic
- 
- mostlyclean: mostlyclean-am
-@@ -302,8 +332,8 @@
- uninstall-am: uninstall-info-am
- 
- .PHONY: all all-am check check-am clean clean-generic distclean \
--	distclean-generic distdir dvi dvi-am info info-am install \
--	install-am install-data install-data-am install-exec \
-+	distclean-generic distdir dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am install-exec \
- 	install-exec-am install-info install-info-am install-man \
- 	install-strip installcheck installcheck-am installdirs \
- 	maintainer-clean maintainer-clean-generic mostlyclean \
-diff -Naur flex-2.5.31.orig/tests/test-bison-yylval/Makefile.in flex-2.5.31/tests/test-bison-yylval/Makefile.in
---- flex-2.5.31.orig/tests/test-bison-yylval/Makefile.in	2003-04-01 16:32:38.000000000 +0000
-+++ flex-2.5.31/tests/test-bison-yylval/Makefile.in	2005-01-08 07:43:02.208845320 +0000
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.7 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # @configure_input@
- 
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -34,7 +34,6 @@
- # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- # PURPOSE.
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -42,7 +41,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -57,6 +55,21 @@
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
- host_triplet = @host@
-+subdir = tests/test-bison-yylval
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
-+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -96,12 +109,16 @@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
- LIBICONV = @LIBICONV@
- LIBINTL = @LIBINTL@
-+LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LN_S = @LN_S@
- LTLIBICONV = @LTLIBICONV@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- M4 = @M4@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
-@@ -132,6 +149,7 @@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
- am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
- bindir = @bindir@
- build = @build@
-@@ -153,6 +171,7 @@
- libexecdir = @libexecdir@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-@@ -160,35 +179,48 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--
- FLEX = $(top_builddir)/flex
--
- builddir = @builddir@
--
- EXTRA_DIST = scanner.l parser.y test.input main.c
- CLEANFILES = scanner.c scanner.h parser.c parser.h test-bison-yylval $(OBJS) OUTPUT
- OBJS = parser.o scanner.o main.o
--
- AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(builddir)
- #LDFLAGS = $(top_srcdir)/libfl.a 
- YFLAGS = --defines --output=parser.c --name-prefix="test"
--
- testname = test-bison-yylval
--subdir = tests/test-bison-yylval
--mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--DIST_COMMON = Makefile.am Makefile.in
- all: all-am
- 
- .SUFFIXES:
- .SUFFIXES: .c .o
--$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tests/test-bison-yylval/Makefile'; \
- 	cd $(top_srcdir) && \
- 	  $(AUTOMAKE) --gnu  tests/test-bison-yylval/Makefile
--Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- uninstall-info-am:
- tags: TAGS
- TAGS:
-@@ -196,22 +228,20 @@
- ctags: CTAGS
- CTAGS:
- 
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
- 
- distdir: $(DISTFILES)
- 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- 	list='$(DISTFILES)'; for file in $$list; do \
- 	  case $$file in \
- 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- 	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- 	    dir="/$$dir"; \
--	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
- 	  else \
- 	    dir=''; \
- 	  fi; \
-@@ -229,9 +259,7 @@
- check-am: all-am
- check: check-am
- all-am: Makefile
--
- installdirs:
--
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -243,7 +271,7 @@
- installcheck: installcheck-am
- install-strip:
- 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
--	  INSTALL_STRIP_FLAG=-s \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- 	  `test -z '$(STRIP)' || \
- 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
-@@ -252,7 +280,7 @@
- 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
- 
- distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+	-rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
- 	@echo "This command is intended for maintainers to use"
-@@ -262,13 +290,15 @@
- clean-am: clean-generic mostlyclean-am
- 
- distclean: distclean-am
--
-+	-rm -f Makefile
- distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
- dvi-am:
- 
-+html: html-am
-+
- info: info-am
- 
- info-am:
-@@ -284,7 +314,7 @@
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
--
-+	-rm -f Makefile
- maintainer-clean-am: distclean-am maintainer-clean-generic
- 
- mostlyclean: mostlyclean-am
-@@ -302,8 +332,8 @@
- uninstall-am: uninstall-info-am
- 
- .PHONY: all all-am check check-am clean clean-generic distclean \
--	distclean-generic distdir dvi dvi-am info info-am install \
--	install-am install-data install-data-am install-exec \
-+	distclean-generic distdir dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am install-exec \
- 	install-exec-am install-info install-info-am install-man \
- 	install-strip installcheck installcheck-am installdirs \
- 	maintainer-clean maintainer-clean-generic mostlyclean \
-diff -Naur flex-2.5.31.orig/tests/test-c++-basic/Makefile.in flex-2.5.31/tests/test-c++-basic/Makefile.in
---- flex-2.5.31.orig/tests/test-c++-basic/Makefile.in	2003-04-01 16:32:39.000000000 +0000
-+++ flex-2.5.31/tests/test-c++-basic/Makefile.in	2005-01-08 07:43:02.221843344 +0000
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.7 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # @configure_input@
- 
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -34,7 +34,6 @@
- # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- # PURPOSE.
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -42,7 +41,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -57,6 +55,21 @@
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
- host_triplet = @host@
-+subdir = tests/test-c++-basic
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
-+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -96,12 +109,16 @@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
- LIBICONV = @LIBICONV@
- LIBINTL = @LIBINTL@
-+LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LN_S = @LN_S@
- LTLIBICONV = @LTLIBICONV@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- M4 = @M4@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
-@@ -132,6 +149,7 @@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
- am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
- bindir = @bindir@
- build = @build@
-@@ -153,6 +171,7 @@
- libexecdir = @libexecdir@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-@@ -160,33 +179,47 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--
- FLEX = $(top_builddir)/flex
--
- EXTRA_DIST = scanner.l test.input
- CLEANFILES = scanner.cpp scanner.h test-c++-basic OUTPUT $(OBJS)
- OBJS = scanner.o
--
- AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)
- LFLAGS = -+
--
- #LDFLAGS = 
- testname = test-c++-basic
--subdir = tests/test-c++-basic
--mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--DIST_COMMON = Makefile.am Makefile.in
- all: all-am
- 
- .SUFFIXES:
- .SUFFIXES: .cpp .o
--$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tests/test-c++-basic/Makefile'; \
- 	cd $(top_srcdir) && \
- 	  $(AUTOMAKE) --gnu  tests/test-c++-basic/Makefile
--Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- uninstall-info-am:
- tags: TAGS
- TAGS:
-@@ -194,22 +227,20 @@
- ctags: CTAGS
- CTAGS:
- 
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
- 
- distdir: $(DISTFILES)
- 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- 	list='$(DISTFILES)'; for file in $$list; do \
- 	  case $$file in \
- 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- 	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- 	    dir="/$$dir"; \
--	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
- 	  else \
- 	    dir=''; \
- 	  fi; \
-@@ -227,9 +258,7 @@
- check-am: all-am
- check: check-am
- all-am: Makefile
--
- installdirs:
--
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -241,7 +270,7 @@
- installcheck: installcheck-am
- install-strip:
- 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
--	  INSTALL_STRIP_FLAG=-s \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- 	  `test -z '$(STRIP)' || \
- 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
-@@ -250,7 +279,7 @@
- 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
- 
- distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+	-rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
- 	@echo "This command is intended for maintainers to use"
-@@ -260,13 +289,15 @@
- clean-am: clean-generic mostlyclean-am
- 
- distclean: distclean-am
--
-+	-rm -f Makefile
- distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
- dvi-am:
- 
-+html: html-am
-+
- info: info-am
- 
- info-am:
-@@ -282,7 +313,7 @@
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
--
-+	-rm -f Makefile
- maintainer-clean-am: distclean-am maintainer-clean-generic
- 
- mostlyclean: mostlyclean-am
-@@ -300,8 +331,8 @@
- uninstall-am: uninstall-info-am
- 
- .PHONY: all all-am check check-am clean clean-generic distclean \
--	distclean-generic distdir dvi dvi-am info info-am install \
--	install-am install-data install-data-am install-exec \
-+	distclean-generic distdir dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am install-exec \
- 	install-exec-am install-info install-info-am install-man \
- 	install-strip installcheck installcheck-am installdirs \
- 	maintainer-clean maintainer-clean-generic mostlyclean \
-diff -Naur flex-2.5.31.orig/tests/test-c++-multiple-scanners/Makefile.in flex-2.5.31/tests/test-c++-multiple-scanners/Makefile.in
---- flex-2.5.31.orig/tests/test-c++-multiple-scanners/Makefile.in	2003-04-01 16:32:39.000000000 +0000
-+++ flex-2.5.31/tests/test-c++-multiple-scanners/Makefile.in	2005-01-08 07:43:02.238840760 +0000
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.7 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # @configure_input@
- 
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -34,7 +34,6 @@
- # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- # PURPOSE.
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -42,7 +41,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -57,6 +55,21 @@
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
- host_triplet = @host@
-+subdir = tests/test-c++-multiple-scanners
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
-+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -96,12 +109,16 @@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
- LIBICONV = @LIBICONV@
- LIBINTL = @LIBINTL@
-+LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LN_S = @LN_S@
- LTLIBICONV = @LTLIBICONV@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- M4 = @M4@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
-@@ -132,6 +149,7 @@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
- am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
- bindir = @bindir@
- build = @build@
-@@ -153,6 +171,7 @@
- libexecdir = @libexecdir@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-@@ -160,34 +179,48 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--
- FLEX = $(top_builddir)/flex
- builddir = @builddir@
--
- EXTRA_DIST = scanner-1.l scanner-2.l main.cpp test.input
- CLEANFILES = scanner-1.cpp test-c++-multiple-scanners OUTPUT $(OBJS) scanner-2.cpp
- OBJS = scanner-1.o scanner-2.o main.o
--
- AM_CXXFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)
--
- #LDFLAGS = $(top_srcdir)/libfl.a 
- #YFLAGS = --defines --output=parser.c
- testname = test-c++-multiple-scanners
--subdir = tests/test-c++-multiple-scanners
--mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--DIST_COMMON = Makefile.am Makefile.in
- all: all-am
- 
- .SUFFIXES:
- .SUFFIXES: .cpp .o
--$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tests/test-c++-multiple-scanners/Makefile'; \
- 	cd $(top_srcdir) && \
- 	  $(AUTOMAKE) --gnu  tests/test-c++-multiple-scanners/Makefile
--Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- uninstall-info-am:
- tags: TAGS
- TAGS:
-@@ -195,22 +228,20 @@
- ctags: CTAGS
- CTAGS:
- 
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
- 
- distdir: $(DISTFILES)
- 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- 	list='$(DISTFILES)'; for file in $$list; do \
- 	  case $$file in \
- 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- 	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- 	    dir="/$$dir"; \
--	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
- 	  else \
- 	    dir=''; \
- 	  fi; \
-@@ -228,9 +259,7 @@
- check-am: all-am
- check: check-am
- all-am: Makefile
--
- installdirs:
--
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -242,7 +271,7 @@
- installcheck: installcheck-am
- install-strip:
- 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
--	  INSTALL_STRIP_FLAG=-s \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- 	  `test -z '$(STRIP)' || \
- 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
-@@ -251,7 +280,7 @@
- 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
- 
- distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+	-rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
- 	@echo "This command is intended for maintainers to use"
-@@ -261,13 +290,15 @@
- clean-am: clean-generic mostlyclean-am
- 
- distclean: distclean-am
--
-+	-rm -f Makefile
- distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
- dvi-am:
- 
-+html: html-am
-+
- info: info-am
- 
- info-am:
-@@ -283,7 +314,7 @@
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
--
-+	-rm -f Makefile
- maintainer-clean-am: distclean-am maintainer-clean-generic
- 
- mostlyclean: mostlyclean-am
-@@ -301,8 +332,8 @@
- uninstall-am: uninstall-info-am
- 
- .PHONY: all all-am check check-am clean clean-generic distclean \
--	distclean-generic distdir dvi dvi-am info info-am install \
--	install-am install-data install-data-am install-exec \
-+	distclean-generic distdir dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am install-exec \
- 	install-exec-am install-info install-info-am install-man \
- 	install-strip installcheck installcheck-am installdirs \
- 	maintainer-clean maintainer-clean-generic mostlyclean \
-diff -Naur flex-2.5.31.orig/tests/test-c-cpp-nr/Makefile.in flex-2.5.31/tests/test-c-cpp-nr/Makefile.in
---- flex-2.5.31.orig/tests/test-c-cpp-nr/Makefile.in	2003-04-01 16:32:39.000000000 +0000
-+++ flex-2.5.31/tests/test-c-cpp-nr/Makefile.in	2005-01-08 07:43:02.252838632 +0000
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.7 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # @configure_input@
- 
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -34,7 +34,6 @@
- # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- # PURPOSE.
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -42,7 +41,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -57,6 +55,21 @@
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
- host_triplet = @host@
-+subdir = tests/test-c-cpp-nr
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
-+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -96,12 +109,16 @@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
- LIBICONV = @LIBICONV@
- LIBINTL = @LIBINTL@
-+LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LN_S = @LN_S@
- LTLIBICONV = @LTLIBICONV@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- M4 = @M4@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
-@@ -132,6 +149,7 @@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
- am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
- bindir = @bindir@
- build = @build@
-@@ -153,6 +171,7 @@
- libexecdir = @libexecdir@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-@@ -160,33 +179,47 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--
- FLEX = $(top_builddir)/flex
--
- EXTRA_DIST = scanner.l test.input
- CLEANFILES = scanner.cpp test-c-cpp-nr $(OBJS) OUTPUT
- OBJS = scanner.o
--
- AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)
--
- #LDFLAGS = $(top_srcdir)/libfl.a 
- #YFLAGS = --defines --output=parser.c
- testname = test-c-cpp-nr
--subdir = tests/test-c-cpp-nr
--mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--DIST_COMMON = Makefile.am Makefile.in
- all: all-am
- 
- .SUFFIXES:
- .SUFFIXES: .cpp .o
--$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tests/test-c-cpp-nr/Makefile'; \
- 	cd $(top_srcdir) && \
- 	  $(AUTOMAKE) --gnu  tests/test-c-cpp-nr/Makefile
--Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- uninstall-info-am:
- tags: TAGS
- TAGS:
-@@ -194,22 +227,20 @@
- ctags: CTAGS
- CTAGS:
- 
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
- 
- distdir: $(DISTFILES)
- 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- 	list='$(DISTFILES)'; for file in $$list; do \
- 	  case $$file in \
- 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- 	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- 	    dir="/$$dir"; \
--	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
- 	  else \
- 	    dir=''; \
- 	  fi; \
-@@ -227,9 +258,7 @@
- check-am: all-am
- check: check-am
- all-am: Makefile
--
- installdirs:
--
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -241,7 +270,7 @@
- installcheck: installcheck-am
- install-strip:
- 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
--	  INSTALL_STRIP_FLAG=-s \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- 	  `test -z '$(STRIP)' || \
- 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
-@@ -250,7 +279,7 @@
- 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
- 
- distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+	-rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
- 	@echo "This command is intended for maintainers to use"
-@@ -260,13 +289,15 @@
- clean-am: clean-generic mostlyclean-am
- 
- distclean: distclean-am
--
-+	-rm -f Makefile
- distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
- dvi-am:
- 
-+html: html-am
-+
- info: info-am
- 
- info-am:
-@@ -282,7 +313,7 @@
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
--
-+	-rm -f Makefile
- maintainer-clean-am: distclean-am maintainer-clean-generic
- 
- mostlyclean: mostlyclean-am
-@@ -300,8 +331,8 @@
- uninstall-am: uninstall-info-am
- 
- .PHONY: all all-am check check-am clean clean-generic distclean \
--	distclean-generic distdir dvi dvi-am info info-am install \
--	install-am install-data install-data-am install-exec \
-+	distclean-generic distdir dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am install-exec \
- 	install-exec-am install-info install-info-am install-man \
- 	install-strip installcheck installcheck-am installdirs \
- 	maintainer-clean maintainer-clean-generic mostlyclean \
-diff -Naur flex-2.5.31.orig/tests/test-c-cpp-r/Makefile.in flex-2.5.31/tests/test-c-cpp-r/Makefile.in
---- flex-2.5.31.orig/tests/test-c-cpp-r/Makefile.in	2003-04-01 16:32:40.000000000 +0000
-+++ flex-2.5.31/tests/test-c-cpp-r/Makefile.in	2005-01-08 07:43:02.265836656 +0000
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.7 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # @configure_input@
- 
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -34,7 +34,6 @@
- # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- # PURPOSE.
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -42,7 +41,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -57,6 +55,21 @@
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
- host_triplet = @host@
-+subdir = tests/test-c-cpp-r
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
-+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -96,12 +109,16 @@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
- LIBICONV = @LIBICONV@
- LIBINTL = @LIBINTL@
-+LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LN_S = @LN_S@
- LTLIBICONV = @LTLIBICONV@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- M4 = @M4@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
-@@ -132,6 +149,7 @@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
- am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
- bindir = @bindir@
- build = @build@
-@@ -153,6 +171,7 @@
- libexecdir = @libexecdir@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-@@ -160,33 +179,47 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--
- FLEX = $(top_builddir)/flex
--
- EXTRA_DIST = scanner.l test.input
- CLEANFILES = scanner.cpp test-c-cpp-r $(OBJS) OUTPUT
- OBJS = scanner.o
--
- AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)
--
- #LDFLAGS = $(top_srcdir)/libfl.a 
- #YFLAGS = --defines --output=parser.c
- testname = test-c-cpp-r
--subdir = tests/test-c-cpp-r
--mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--DIST_COMMON = Makefile.am Makefile.in
- all: all-am
- 
- .SUFFIXES:
- .SUFFIXES: .cpp .o
--$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tests/test-c-cpp-r/Makefile'; \
- 	cd $(top_srcdir) && \
- 	  $(AUTOMAKE) --gnu  tests/test-c-cpp-r/Makefile
--Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- uninstall-info-am:
- tags: TAGS
- TAGS:
-@@ -194,22 +227,20 @@
- ctags: CTAGS
- CTAGS:
- 
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
- 
- distdir: $(DISTFILES)
- 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- 	list='$(DISTFILES)'; for file in $$list; do \
- 	  case $$file in \
- 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- 	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- 	    dir="/$$dir"; \
--	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
- 	  else \
- 	    dir=''; \
- 	  fi; \
-@@ -227,9 +258,7 @@
- check-am: all-am
- check: check-am
- all-am: Makefile
--
- installdirs:
--
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -241,7 +270,7 @@
- installcheck: installcheck-am
- install-strip:
- 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
--	  INSTALL_STRIP_FLAG=-s \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- 	  `test -z '$(STRIP)' || \
- 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
-@@ -250,7 +279,7 @@
- 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
- 
- distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+	-rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
- 	@echo "This command is intended for maintainers to use"
-@@ -260,13 +289,15 @@
- clean-am: clean-generic mostlyclean-am
- 
- distclean: distclean-am
--
-+	-rm -f Makefile
- distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
- dvi-am:
- 
-+html: html-am
-+
- info: info-am
- 
- info-am:
-@@ -282,7 +313,7 @@
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
--
-+	-rm -f Makefile
- maintainer-clean-am: distclean-am maintainer-clean-generic
- 
- mostlyclean: mostlyclean-am
-@@ -300,8 +331,8 @@
- uninstall-am: uninstall-info-am
- 
- .PHONY: all all-am check check-am clean clean-generic distclean \
--	distclean-generic distdir dvi dvi-am info info-am install \
--	install-am install-data install-data-am install-exec \
-+	distclean-generic distdir dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am install-exec \
- 	install-exec-am install-info install-info-am install-man \
- 	install-strip installcheck installcheck-am installdirs \
- 	maintainer-clean maintainer-clean-generic mostlyclean \
-diff -Naur flex-2.5.31.orig/tests/test-debug-nr/Makefile.in flex-2.5.31/tests/test-debug-nr/Makefile.in
---- flex-2.5.31.orig/tests/test-debug-nr/Makefile.in	2003-04-01 16:32:40.000000000 +0000
-+++ flex-2.5.31/tests/test-debug-nr/Makefile.in	2005-01-08 07:43:02.278834680 +0000
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.7 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # @configure_input@
- 
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -34,7 +34,6 @@
- # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- # PURPOSE.
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -42,7 +41,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -57,6 +55,21 @@
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
- host_triplet = @host@
-+subdir = tests/test-debug-nr
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
-+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -96,12 +109,16 @@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
- LIBICONV = @LIBICONV@
- LIBINTL = @LIBINTL@
-+LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LN_S = @LN_S@
- LTLIBICONV = @LTLIBICONV@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- M4 = @M4@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
-@@ -132,6 +149,7 @@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
- am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
- bindir = @bindir@
- build = @build@
-@@ -153,6 +171,7 @@
- libexecdir = @libexecdir@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-@@ -160,32 +179,46 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--
- FLEX = $(top_builddir)/flex
--
- EXTRA_DIST = scanner.l test.input
- CLEANFILES = scanner.c scanner.h test-debug-nr OUTPUT $(OBJS)
- OBJS = scanner.o
--
- AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)
--
- #LDFLAGS = $(top_srcdir)/libfl.a 
- testname = test-debug-nr
--subdir = tests/test-debug-nr
--mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--DIST_COMMON = Makefile.am Makefile.in
- all: all-am
- 
- .SUFFIXES:
- .SUFFIXES: .c .o
--$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tests/test-debug-nr/Makefile'; \
- 	cd $(top_srcdir) && \
- 	  $(AUTOMAKE) --gnu  tests/test-debug-nr/Makefile
--Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- uninstall-info-am:
- tags: TAGS
- TAGS:
-@@ -193,22 +226,20 @@
- ctags: CTAGS
- CTAGS:
- 
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
- 
- distdir: $(DISTFILES)
- 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- 	list='$(DISTFILES)'; for file in $$list; do \
- 	  case $$file in \
- 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- 	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- 	    dir="/$$dir"; \
--	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
- 	  else \
- 	    dir=''; \
- 	  fi; \
-@@ -226,9 +257,7 @@
- check-am: all-am
- check: check-am
- all-am: Makefile
--
- installdirs:
--
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -240,7 +269,7 @@
- installcheck: installcheck-am
- install-strip:
- 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
--	  INSTALL_STRIP_FLAG=-s \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- 	  `test -z '$(STRIP)' || \
- 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
-@@ -249,7 +278,7 @@
- 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
- 
- distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+	-rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
- 	@echo "This command is intended for maintainers to use"
-@@ -259,13 +288,15 @@
- clean-am: clean-generic mostlyclean-am
- 
- distclean: distclean-am
--
-+	-rm -f Makefile
- distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
- dvi-am:
- 
-+html: html-am
-+
- info: info-am
- 
- info-am:
-@@ -281,7 +312,7 @@
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
--
-+	-rm -f Makefile
- maintainer-clean-am: distclean-am maintainer-clean-generic
- 
- mostlyclean: mostlyclean-am
-@@ -299,8 +330,8 @@
- uninstall-am: uninstall-info-am
- 
- .PHONY: all all-am check check-am clean clean-generic distclean \
--	distclean-generic distdir dvi dvi-am info info-am install \
--	install-am install-data install-data-am install-exec \
-+	distclean-generic distdir dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am install-exec \
- 	install-exec-am install-info install-info-am install-man \
- 	install-strip installcheck installcheck-am installdirs \
- 	maintainer-clean maintainer-clean-generic mostlyclean \
-diff -Naur flex-2.5.31.orig/tests/test-debug-r/Makefile.in flex-2.5.31/tests/test-debug-r/Makefile.in
---- flex-2.5.31.orig/tests/test-debug-r/Makefile.in	2003-04-01 16:32:40.000000000 +0000
-+++ flex-2.5.31/tests/test-debug-r/Makefile.in	2005-01-08 07:43:02.307830272 +0000
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.7 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # @configure_input@
- 
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -34,7 +34,6 @@
- # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- # PURPOSE.
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -42,7 +41,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -57,6 +55,21 @@
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
- host_triplet = @host@
-+subdir = tests/test-debug-r
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
-+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -96,12 +109,16 @@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
- LIBICONV = @LIBICONV@
- LIBINTL = @LIBINTL@
-+LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LN_S = @LN_S@
- LTLIBICONV = @LTLIBICONV@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- M4 = @M4@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
-@@ -132,6 +149,7 @@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
- am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
- bindir = @bindir@
- build = @build@
-@@ -153,6 +171,7 @@
- libexecdir = @libexecdir@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-@@ -160,32 +179,46 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--
- FLEX = $(top_builddir)/flex
--
- EXTRA_DIST = scanner.l test.input
- CLEANFILES = scanner.c test-debug-r OUTPUT $(OBJS)
- OBJS = scanner.o 
--
- AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)
--
- #LDFLAGS = $(top_srcdir)/libfl.a 
- testname = test-debug-r
--subdir = tests/test-debug-r
--mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--DIST_COMMON = Makefile.am Makefile.in
- all: all-am
- 
- .SUFFIXES:
- .SUFFIXES: .c .o
--$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tests/test-debug-r/Makefile'; \
- 	cd $(top_srcdir) && \
- 	  $(AUTOMAKE) --gnu  tests/test-debug-r/Makefile
--Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- uninstall-info-am:
- tags: TAGS
- TAGS:
-@@ -193,22 +226,20 @@
- ctags: CTAGS
- CTAGS:
- 
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
- 
- distdir: $(DISTFILES)
- 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- 	list='$(DISTFILES)'; for file in $$list; do \
- 	  case $$file in \
- 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- 	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- 	    dir="/$$dir"; \
--	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
- 	  else \
- 	    dir=''; \
- 	  fi; \
-@@ -226,9 +257,7 @@
- check-am: all-am
- check: check-am
- all-am: Makefile
--
- installdirs:
--
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -240,7 +269,7 @@
- installcheck: installcheck-am
- install-strip:
- 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
--	  INSTALL_STRIP_FLAG=-s \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- 	  `test -z '$(STRIP)' || \
- 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
-@@ -249,7 +278,7 @@
- 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
- 
- distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+	-rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
- 	@echo "This command is intended for maintainers to use"
-@@ -259,13 +288,15 @@
- clean-am: clean-generic mostlyclean-am
- 
- distclean: distclean-am
--
-+	-rm -f Makefile
- distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
- dvi-am:
- 
-+html: html-am
-+
- info: info-am
- 
- info-am:
-@@ -281,7 +312,7 @@
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
--
-+	-rm -f Makefile
- maintainer-clean-am: distclean-am maintainer-clean-generic
- 
- mostlyclean: mostlyclean-am
-@@ -299,8 +330,8 @@
- uninstall-am: uninstall-info-am
- 
- .PHONY: all all-am check check-am clean clean-generic distclean \
--	distclean-generic distdir dvi dvi-am info info-am install \
--	install-am install-data install-data-am install-exec \
-+	distclean-generic distdir dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am install-exec \
- 	install-exec-am install-info install-info-am install-man \
- 	install-strip installcheck installcheck-am installdirs \
- 	maintainer-clean maintainer-clean-generic mostlyclean \
-diff -Naur flex-2.5.31.orig/tests/test-header-nr/Makefile.in flex-2.5.31/tests/test-header-nr/Makefile.in
---- flex-2.5.31.orig/tests/test-header-nr/Makefile.in	2003-04-01 16:32:40.000000000 +0000
-+++ flex-2.5.31/tests/test-header-nr/Makefile.in	2005-01-08 07:43:02.323827840 +0000
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.7 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # @configure_input@
- 
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -34,7 +34,6 @@
- # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- # PURPOSE.
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -42,7 +41,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -57,6 +55,21 @@
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
- host_triplet = @host@
-+subdir = tests/test-header-nr
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
-+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -96,12 +109,16 @@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
- LIBICONV = @LIBICONV@
- LIBINTL = @LIBINTL@
-+LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LN_S = @LN_S@
- LTLIBICONV = @LTLIBICONV@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- M4 = @M4@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
-@@ -132,6 +149,7 @@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
- am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
- bindir = @bindir@
- build = @build@
-@@ -153,6 +171,7 @@
- libexecdir = @libexecdir@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-@@ -160,35 +179,48 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--
- FLEX = $(top_builddir)/flex
--
- builddir = @builddir@
--
- EXTRA_DIST = scanner.l  test.input main.c
- CLEANFILES = scanner.c scanner.h test-header-nr $(OBJS) OUTPUT
- OBJS = scanner.o main.o
--
- AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(builddir)
--
- #LDFLAGS = $(top_srcdir)/libfl.a 
- #YFLAGS = --defines --output=parser.c
- testname = test-header-nr
--subdir = tests/test-header-nr
--mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--DIST_COMMON = Makefile.am Makefile.in
- all: all-am
- 
- .SUFFIXES:
- .SUFFIXES: .c .o
--$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tests/test-header-nr/Makefile'; \
- 	cd $(top_srcdir) && \
- 	  $(AUTOMAKE) --gnu  tests/test-header-nr/Makefile
--Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- uninstall-info-am:
- tags: TAGS
- TAGS:
-@@ -196,22 +228,20 @@
- ctags: CTAGS
- CTAGS:
- 
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
- 
- distdir: $(DISTFILES)
- 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- 	list='$(DISTFILES)'; for file in $$list; do \
- 	  case $$file in \
- 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- 	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- 	    dir="/$$dir"; \
--	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
- 	  else \
- 	    dir=''; \
- 	  fi; \
-@@ -229,9 +259,7 @@
- check-am: all-am
- check: check-am
- all-am: Makefile
--
- installdirs:
--
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -243,7 +271,7 @@
- installcheck: installcheck-am
- install-strip:
- 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
--	  INSTALL_STRIP_FLAG=-s \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- 	  `test -z '$(STRIP)' || \
- 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
-@@ -252,7 +280,7 @@
- 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
- 
- distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+	-rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
- 	@echo "This command is intended for maintainers to use"
-@@ -262,13 +290,15 @@
- clean-am: clean-generic mostlyclean-am
- 
- distclean: distclean-am
--
-+	-rm -f Makefile
- distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
- dvi-am:
- 
-+html: html-am
-+
- info: info-am
- 
- info-am:
-@@ -284,7 +314,7 @@
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
--
-+	-rm -f Makefile
- maintainer-clean-am: distclean-am maintainer-clean-generic
- 
- mostlyclean: mostlyclean-am
-@@ -302,8 +332,8 @@
- uninstall-am: uninstall-info-am
- 
- .PHONY: all all-am check check-am clean clean-generic distclean \
--	distclean-generic distdir dvi dvi-am info info-am install \
--	install-am install-data install-data-am install-exec \
-+	distclean-generic distdir dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am install-exec \
- 	install-exec-am install-info install-info-am install-man \
- 	install-strip installcheck installcheck-am installdirs \
- 	maintainer-clean maintainer-clean-generic mostlyclean \
-diff -Naur flex-2.5.31.orig/tests/test-header-r/Makefile.in flex-2.5.31/tests/test-header-r/Makefile.in
---- flex-2.5.31.orig/tests/test-header-r/Makefile.in	2003-04-01 16:32:41.000000000 +0000
-+++ flex-2.5.31/tests/test-header-r/Makefile.in	2005-01-08 07:43:02.338825560 +0000
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.7 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # @configure_input@
- 
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -34,7 +34,6 @@
- # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- # PURPOSE.
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -42,7 +41,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -57,6 +55,21 @@
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
- host_triplet = @host@
-+subdir = tests/test-header-r
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
-+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -96,12 +109,16 @@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
- LIBICONV = @LIBICONV@
- LIBINTL = @LIBINTL@
-+LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LN_S = @LN_S@
- LTLIBICONV = @LTLIBICONV@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- M4 = @M4@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
-@@ -132,6 +149,7 @@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
- am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
- bindir = @bindir@
- build = @build@
-@@ -153,6 +171,7 @@
- libexecdir = @libexecdir@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-@@ -160,36 +179,49 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--
- FLEX = $(top_builddir)/flex
--
- builddir = @builddir@
--
- EXTRA_DIST = scanner.l test.input main.c
- CLEANFILES = scanner.c scanner.h test-header-r OUTPUT $(OBJS)
- OBJS = scanner.o main.o
--
- AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(builddir)
- #LDFLAGS = $(top_srcdir)/libfl.a 
- LFLAGS = --header="scanner.h"
--
- #YFLAGS = --defines --output=parser.c
- testname = test-header-r
--subdir = tests/test-header-r
--mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--DIST_COMMON = Makefile.am Makefile.in
- all: all-am
- 
- .SUFFIXES:
- .SUFFIXES: .c .o
--$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tests/test-header-r/Makefile'; \
- 	cd $(top_srcdir) && \
- 	  $(AUTOMAKE) --gnu  tests/test-header-r/Makefile
--Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- uninstall-info-am:
- tags: TAGS
- TAGS:
-@@ -197,22 +229,20 @@
- ctags: CTAGS
- CTAGS:
- 
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
- 
- distdir: $(DISTFILES)
- 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- 	list='$(DISTFILES)'; for file in $$list; do \
- 	  case $$file in \
- 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- 	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- 	    dir="/$$dir"; \
--	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
- 	  else \
- 	    dir=''; \
- 	  fi; \
-@@ -230,9 +260,7 @@
- check-am: all-am
- check: check-am
- all-am: Makefile
--
- installdirs:
--
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -244,7 +272,7 @@
- installcheck: installcheck-am
- install-strip:
- 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
--	  INSTALL_STRIP_FLAG=-s \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- 	  `test -z '$(STRIP)' || \
- 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
-@@ -253,7 +281,7 @@
- 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
- 
- distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+	-rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
- 	@echo "This command is intended for maintainers to use"
-@@ -263,13 +291,15 @@
- clean-am: clean-generic mostlyclean-am
- 
- distclean: distclean-am
--
-+	-rm -f Makefile
- distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
- dvi-am:
- 
-+html: html-am
-+
- info: info-am
- 
- info-am:
-@@ -285,7 +315,7 @@
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
--
-+	-rm -f Makefile
- maintainer-clean-am: distclean-am maintainer-clean-generic
- 
- mostlyclean: mostlyclean-am
-@@ -303,8 +333,8 @@
- uninstall-am: uninstall-info-am
- 
- .PHONY: all all-am check check-am clean clean-generic distclean \
--	distclean-generic distdir dvi dvi-am info info-am install \
--	install-am install-data install-data-am install-exec \
-+	distclean-generic distdir dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am install-exec \
- 	install-exec-am install-info install-info-am install-man \
- 	install-strip installcheck installcheck-am installdirs \
- 	maintainer-clean maintainer-clean-generic mostlyclean \
-diff -Naur flex-2.5.31.orig/tests/test-include-by-buffer/Makefile.in flex-2.5.31/tests/test-include-by-buffer/Makefile.in
---- flex-2.5.31.orig/tests/test-include-by-buffer/Makefile.in	2003-04-01 16:32:41.000000000 +0000
-+++ flex-2.5.31/tests/test-include-by-buffer/Makefile.in	2005-01-08 07:43:02.355822976 +0000
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.7 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # @configure_input@
- 
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -34,7 +34,6 @@
- # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- # PURPOSE.
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -42,7 +41,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -57,6 +55,21 @@
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
- host_triplet = @host@
-+subdir = tests/test-include-by-buffer
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
-+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -96,12 +109,16 @@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
- LIBICONV = @LIBICONV@
- LIBINTL = @LIBINTL@
-+LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LN_S = @LN_S@
- LTLIBICONV = @LTLIBICONV@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- M4 = @M4@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
-@@ -132,6 +149,7 @@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
- am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
- bindir = @bindir@
- build = @build@
-@@ -153,6 +171,7 @@
- libexecdir = @libexecdir@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-@@ -160,34 +179,48 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--
- FLEX = $(top_builddir)/flex
--
- EXTRA_DIST = scanner.l test-1.input test-2.input test-3.input
- CLEANFILES = scanner.c scanner.h parser.c parser.h test-include-by-buffer OUTPUT $(OBJS)
- OBJS = scanner.o # parser.o
--
- AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)
--
- #LDFLAGS = $(top_srcdir)/libfl.a 
- #LFLAGS = --header="scanner.h"
- #YFLAGS = --defines --output=parser.c
- testname = test-include-by-buffer
--subdir = tests/test-include-by-buffer
--mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--DIST_COMMON = Makefile.am Makefile.in
- all: all-am
- 
- .SUFFIXES:
- .SUFFIXES: .c .o
--$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tests/test-include-by-buffer/Makefile'; \
- 	cd $(top_srcdir) && \
- 	  $(AUTOMAKE) --gnu  tests/test-include-by-buffer/Makefile
--Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- uninstall-info-am:
- tags: TAGS
- TAGS:
-@@ -195,22 +228,20 @@
- ctags: CTAGS
- CTAGS:
- 
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
- 
- distdir: $(DISTFILES)
- 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- 	list='$(DISTFILES)'; for file in $$list; do \
- 	  case $$file in \
- 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- 	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- 	    dir="/$$dir"; \
--	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
- 	  else \
- 	    dir=''; \
- 	  fi; \
-@@ -228,9 +259,7 @@
- check-am: all-am
- check: check-am
- all-am: Makefile
--
- installdirs:
--
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -242,7 +271,7 @@
- installcheck: installcheck-am
- install-strip:
- 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
--	  INSTALL_STRIP_FLAG=-s \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- 	  `test -z '$(STRIP)' || \
- 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
-@@ -251,7 +280,7 @@
- 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
- 
- distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+	-rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
- 	@echo "This command is intended for maintainers to use"
-@@ -261,13 +290,15 @@
- clean-am: clean-generic mostlyclean-am
- 
- distclean: distclean-am
--
-+	-rm -f Makefile
- distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
- dvi-am:
- 
-+html: html-am
-+
- info: info-am
- 
- info-am:
-@@ -283,7 +314,7 @@
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
--
-+	-rm -f Makefile
- maintainer-clean-am: distclean-am maintainer-clean-generic
- 
- mostlyclean: mostlyclean-am
-@@ -301,8 +332,8 @@
- uninstall-am: uninstall-info-am
- 
- .PHONY: all all-am check check-am clean clean-generic distclean \
--	distclean-generic distdir dvi dvi-am info info-am install \
--	install-am install-data install-data-am install-exec \
-+	distclean-generic distdir dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am install-exec \
- 	install-exec-am install-info install-info-am install-man \
- 	install-strip installcheck installcheck-am installdirs \
- 	maintainer-clean maintainer-clean-generic mostlyclean \
-diff -Naur flex-2.5.31.orig/tests/test-include-by-push/Makefile.in flex-2.5.31/tests/test-include-by-push/Makefile.in
---- flex-2.5.31.orig/tests/test-include-by-push/Makefile.in	2003-04-01 16:32:41.000000000 +0000
-+++ flex-2.5.31/tests/test-include-by-push/Makefile.in	2005-01-08 07:43:02.372820392 +0000
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.7 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # @configure_input@
- 
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -34,7 +34,6 @@
- # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- # PURPOSE.
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -42,7 +41,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -57,6 +55,21 @@
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
- host_triplet = @host@
-+subdir = tests/test-include-by-push
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
-+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -96,12 +109,16 @@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
- LIBICONV = @LIBICONV@
- LIBINTL = @LIBINTL@
-+LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LN_S = @LN_S@
- LTLIBICONV = @LTLIBICONV@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- M4 = @M4@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
-@@ -132,6 +149,7 @@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
- am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
- bindir = @bindir@
- build = @build@
-@@ -153,6 +171,7 @@
- libexecdir = @libexecdir@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-@@ -160,34 +179,48 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--
- FLEX = $(top_builddir)/flex
--
- EXTRA_DIST = scanner.l test-1.input test-2.input test-3.input
- CLEANFILES = scanner.c scanner.h parser.c parser.h test-include-by-push OUTPUT $(OBJS)
- OBJS = scanner.o # parser.o
--
- AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)
--
- #LDFLAGS = $(top_srcdir)/libfl.a 
- #LFLAGS = --header="scanner.h"
- #YFLAGS = --defines --output=parser.c
- testname = test-include-by-push
--subdir = tests/test-include-by-push
--mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--DIST_COMMON = Makefile.am Makefile.in
- all: all-am
- 
- .SUFFIXES:
- .SUFFIXES: .c .o
--$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tests/test-include-by-push/Makefile'; \
- 	cd $(top_srcdir) && \
- 	  $(AUTOMAKE) --gnu  tests/test-include-by-push/Makefile
--Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- uninstall-info-am:
- tags: TAGS
- TAGS:
-@@ -195,22 +228,20 @@
- ctags: CTAGS
- CTAGS:
- 
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
- 
- distdir: $(DISTFILES)
- 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- 	list='$(DISTFILES)'; for file in $$list; do \
- 	  case $$file in \
- 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- 	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- 	    dir="/$$dir"; \
--	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
- 	  else \
- 	    dir=''; \
- 	  fi; \
-@@ -228,9 +259,7 @@
- check-am: all-am
- check: check-am
- all-am: Makefile
--
- installdirs:
--
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -242,7 +271,7 @@
- installcheck: installcheck-am
- install-strip:
- 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
--	  INSTALL_STRIP_FLAG=-s \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- 	  `test -z '$(STRIP)' || \
- 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
-@@ -251,7 +280,7 @@
- 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
- 
- distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+	-rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
- 	@echo "This command is intended for maintainers to use"
-@@ -261,13 +290,15 @@
- clean-am: clean-generic mostlyclean-am
- 
- distclean: distclean-am
--
-+	-rm -f Makefile
- distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
- dvi-am:
- 
-+html: html-am
-+
- info: info-am
- 
- info-am:
-@@ -283,7 +314,7 @@
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
--
-+	-rm -f Makefile
- maintainer-clean-am: distclean-am maintainer-clean-generic
- 
- mostlyclean: mostlyclean-am
-@@ -301,8 +332,8 @@
- uninstall-am: uninstall-info-am
- 
- .PHONY: all all-am check check-am clean clean-generic distclean \
--	distclean-generic distdir dvi dvi-am info info-am install \
--	install-am install-data install-data-am install-exec \
-+	distclean-generic distdir dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am install-exec \
- 	install-exec-am install-info install-info-am install-man \
- 	install-strip installcheck installcheck-am installdirs \
- 	maintainer-clean maintainer-clean-generic mostlyclean \
-diff -Naur flex-2.5.31.orig/tests/test-include-by-reentrant/Makefile.in flex-2.5.31/tests/test-include-by-reentrant/Makefile.in
---- flex-2.5.31.orig/tests/test-include-by-reentrant/Makefile.in	2003-04-01 16:32:41.000000000 +0000
-+++ flex-2.5.31/tests/test-include-by-reentrant/Makefile.in	2005-01-08 07:43:02.387818112 +0000
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.7 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # @configure_input@
- 
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -34,7 +34,6 @@
- # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- # PURPOSE.
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -42,7 +41,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -57,6 +55,21 @@
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
- host_triplet = @host@
-+subdir = tests/test-include-by-reentrant
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
-+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -96,12 +109,16 @@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
- LIBICONV = @LIBICONV@
- LIBINTL = @LIBINTL@
-+LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LN_S = @LN_S@
- LTLIBICONV = @LTLIBICONV@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- M4 = @M4@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
-@@ -132,6 +149,7 @@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
- am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
- bindir = @bindir@
- build = @build@
-@@ -153,6 +171,7 @@
- libexecdir = @libexecdir@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-@@ -160,34 +179,48 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--
- FLEX = $(top_builddir)/flex
--
- EXTRA_DIST = scanner.l test-1.input test-2.input test-3.input
- CLEANFILES = scanner.c scanner.h parser.c parser.h test-include-by-reentrant OUTPUT $(OBJS)
- OBJS = scanner.o # parser.o
--
- AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)
--
- #LDFLAGS = $(top_srcdir)/libfl.a 
- #LFLAGS = --header="scanner.h"
- #YFLAGS = --defines --output=parser.c
- testname = test-include-by-reentrant
--subdir = tests/test-include-by-reentrant
--mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--DIST_COMMON = Makefile.am Makefile.in
- all: all-am
- 
- .SUFFIXES:
- .SUFFIXES: .c .o
--$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tests/test-include-by-reentrant/Makefile'; \
- 	cd $(top_srcdir) && \
- 	  $(AUTOMAKE) --gnu  tests/test-include-by-reentrant/Makefile
--Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- uninstall-info-am:
- tags: TAGS
- TAGS:
-@@ -195,22 +228,20 @@
- ctags: CTAGS
- CTAGS:
- 
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
- 
- distdir: $(DISTFILES)
- 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- 	list='$(DISTFILES)'; for file in $$list; do \
- 	  case $$file in \
- 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- 	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- 	    dir="/$$dir"; \
--	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
- 	  else \
- 	    dir=''; \
- 	  fi; \
-@@ -228,9 +259,7 @@
- check-am: all-am
- check: check-am
- all-am: Makefile
--
- installdirs:
--
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -242,7 +271,7 @@
- installcheck: installcheck-am
- install-strip:
- 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
--	  INSTALL_STRIP_FLAG=-s \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- 	  `test -z '$(STRIP)' || \
- 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
-@@ -251,7 +280,7 @@
- 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
- 
- distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+	-rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
- 	@echo "This command is intended for maintainers to use"
-@@ -261,13 +290,15 @@
- clean-am: clean-generic mostlyclean-am
- 
- distclean: distclean-am
--
-+	-rm -f Makefile
- distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
- dvi-am:
- 
-+html: html-am
-+
- info: info-am
- 
- info-am:
-@@ -283,7 +314,7 @@
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
--
-+	-rm -f Makefile
- maintainer-clean-am: distclean-am maintainer-clean-generic
- 
- mostlyclean: mostlyclean-am
-@@ -301,8 +332,8 @@
- uninstall-am: uninstall-info-am
- 
- .PHONY: all all-am check check-am clean clean-generic distclean \
--	distclean-generic distdir dvi dvi-am info info-am install \
--	install-am install-data install-data-am install-exec \
-+	distclean-generic distdir dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am install-exec \
- 	install-exec-am install-info install-info-am install-man \
- 	install-strip installcheck installcheck-am installdirs \
- 	maintainer-clean maintainer-clean-generic mostlyclean \
-diff -Naur flex-2.5.31.orig/tests/test-linedir-r/Makefile.in flex-2.5.31/tests/test-linedir-r/Makefile.in
---- flex-2.5.31.orig/tests/test-linedir-r/Makefile.in	2003-04-01 16:32:42.000000000 +0000
-+++ flex-2.5.31/tests/test-linedir-r/Makefile.in	2005-01-08 07:43:02.418813400 +0000
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.7 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # @configure_input@
- 
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -34,7 +34,6 @@
- # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- # PURPOSE.
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -42,7 +41,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -57,6 +55,21 @@
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
- host_triplet = @host@
-+subdir = tests/test-linedir-r
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
-+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -96,12 +109,16 @@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
- LIBICONV = @LIBICONV@
- LIBINTL = @LIBINTL@
-+LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LN_S = @LN_S@
- LTLIBICONV = @LTLIBICONV@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- M4 = @M4@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
-@@ -132,6 +149,7 @@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
- am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
- bindir = @bindir@
- build = @build@
-@@ -153,6 +171,7 @@
- libexecdir = @libexecdir@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-@@ -160,36 +179,49 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--
- FLEX = $(top_builddir)/flex
--
- builddir = @builddir@
--
- EXTRA_DIST = scanner.l test.input main.c check-lines.awk
- CLEANFILES = scanner.c scanner.h test-linedir-r OUTPUT $(OBJS)
- OBJS = scanner.o main.o
--
- AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(builddir)
- #LDFLAGS = $(top_srcdir)/libfl.a 
- LFLAGS = --header="scanner.h"
--
- #YFLAGS = --defines --output=parser.c
- testname = test-linedir-r
--subdir = tests/test-linedir-r
--mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--DIST_COMMON = Makefile.am Makefile.in
- all: all-am
- 
- .SUFFIXES:
- .SUFFIXES: .c .o
--$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tests/test-linedir-r/Makefile'; \
- 	cd $(top_srcdir) && \
- 	  $(AUTOMAKE) --gnu  tests/test-linedir-r/Makefile
--Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- uninstall-info-am:
- tags: TAGS
- TAGS:
-@@ -197,22 +229,20 @@
- ctags: CTAGS
- CTAGS:
- 
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
- 
- distdir: $(DISTFILES)
- 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- 	list='$(DISTFILES)'; for file in $$list; do \
- 	  case $$file in \
- 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- 	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- 	    dir="/$$dir"; \
--	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
- 	  else \
- 	    dir=''; \
- 	  fi; \
-@@ -230,9 +260,7 @@
- check-am: all-am
- check: check-am
- all-am: Makefile
--
- installdirs:
--
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -244,7 +272,7 @@
- installcheck: installcheck-am
- install-strip:
- 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
--	  INSTALL_STRIP_FLAG=-s \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- 	  `test -z '$(STRIP)' || \
- 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
-@@ -253,7 +281,7 @@
- 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
- 
- distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+	-rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
- 	@echo "This command is intended for maintainers to use"
-@@ -263,13 +291,15 @@
- clean-am: clean-generic mostlyclean-am
- 
- distclean: distclean-am
--
-+	-rm -f Makefile
- distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
- dvi-am:
- 
-+html: html-am
-+
- info: info-am
- 
- info-am:
-@@ -285,7 +315,7 @@
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
--
-+	-rm -f Makefile
- maintainer-clean-am: distclean-am maintainer-clean-generic
- 
- mostlyclean: mostlyclean-am
-@@ -303,8 +333,8 @@
- uninstall-am: uninstall-info-am
- 
- .PHONY: all all-am check check-am clean clean-generic distclean \
--	distclean-generic distdir dvi dvi-am info info-am install \
--	install-am install-data install-data-am install-exec \
-+	distclean-generic distdir dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am install-exec \
- 	install-exec-am install-info install-info-am install-man \
- 	install-strip installcheck installcheck-am installdirs \
- 	maintainer-clean maintainer-clean-generic mostlyclean \
-diff -Naur flex-2.5.31.orig/tests/test-lineno-nr/Makefile.in flex-2.5.31/tests/test-lineno-nr/Makefile.in
---- flex-2.5.31.orig/tests/test-lineno-nr/Makefile.in	2003-04-01 16:32:42.000000000 +0000
-+++ flex-2.5.31/tests/test-lineno-nr/Makefile.in	2005-01-08 07:43:02.431811424 +0000
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.7 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # @configure_input@
- 
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -34,7 +34,6 @@
- # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- # PURPOSE.
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -42,7 +41,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -57,6 +55,21 @@
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
- host_triplet = @host@
-+subdir = tests/test-lineno-nr
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
-+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -96,12 +109,16 @@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
- LIBICONV = @LIBICONV@
- LIBINTL = @LIBINTL@
-+LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LN_S = @LN_S@
- LTLIBICONV = @LTLIBICONV@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- M4 = @M4@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
-@@ -132,6 +149,7 @@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
- am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
- bindir = @bindir@
- build = @build@
-@@ -153,6 +171,7 @@
- libexecdir = @libexecdir@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-@@ -160,31 +179,45 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--
- FLEX = $(top_builddir)/flex
--
- EXTRA_DIST = scanner.l test.input
- CLEANFILES = scanner.c test-lineno-nr OUTPUT $(OBJS)
- OBJS = scanner.o
--
- AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)
--
- testname = test-lineno-nr
--subdir = tests/test-lineno-nr
--mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--DIST_COMMON = Makefile.am Makefile.in
- all: all-am
- 
- .SUFFIXES:
- .SUFFIXES: .c .o
--$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tests/test-lineno-nr/Makefile'; \
- 	cd $(top_srcdir) && \
- 	  $(AUTOMAKE) --gnu  tests/test-lineno-nr/Makefile
--Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- uninstall-info-am:
- tags: TAGS
- TAGS:
-@@ -192,22 +225,20 @@
- ctags: CTAGS
- CTAGS:
- 
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
- 
- distdir: $(DISTFILES)
- 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- 	list='$(DISTFILES)'; for file in $$list; do \
- 	  case $$file in \
- 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- 	  esac; \
- 	  if test -f $$file ||