GNU Flex's libfl library provides nothing. Let us not refer to it. It

only causes build issues on some systems where it is not provided
in the standard location, or is not cross-compiled properly.

* Makefile (LEXLIB): Reference to variable removed.

* configure (lexlib): Variable removed.
(LEXLIB): config.make variable not generated.

* parser.l (yywrap): Provide this trivial function as inline.

1 files changed, 9 insertions, 0 deletions

diff --git a/parser.l b/parser.l
index 180f5fa4..e538b22c 100644
--- a/parser.l
+++ b/parser.l
@@ -79,6 +79,15 @@ int yylex_destroy(void)
 int yyget_column(yyscan_t);
 void yyset_column (int column_no, yyscan_t yyscanner);
 
+/* The following function is all that libflex provides.
+   By providing it here, we eliminate the need to link libflex. */
+#define YY_SKIP_YYWRAP
+INLINE int yywrap(yyscan_t scanner)
+{
+  (void) scanner;
+  return 1;
+}
+
 void yyerror(scanner_t *scanner, parser_t *parser, const char *s)
 {
   yyerrorf(scanner, lit("~a"), string_utf8(s), nao);