Revert last Makefile.am change, and fix it correctly. I _think_ this won't break...

Original commit message from CVS:
Revert last Makefile.am change, and fix it correctly.  I _think_
this won't break with earlier flex versions, otherwise let me know.

diff --git a/common b/common
index 50879a6..0ce4bbf 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 50879a63c4fa8f2544d4d89a9dbfa0f5720c3266
+Subproject commit 0ce4bbf0bc51c08694a8a1e0bec7624094b043d6

diff --git a/gst/parse/Makefile.am b/gst/parse/Makefile.am
index b17cacd..e3c2982 100644 (file)
--- a/gst/parse/Makefile.am
+++ b/gst/parse/Makefile.am
@@ -6,10 +6,6 @@ CLEANFILES = grammar.tab.h grammar.tab.c lex._gst_parse_yy.c grammar.output
 
 EXTRA_DIST = grammar.y parse.l types.h
 
-# flex 2.5.31 produces code that causes compilation warnings
-# (and thus errors)
-DISABLE_FLEX_WARNING = -Wno-unused-function
-
 nodist_libgstparse_la_SOURCES = lex._gst_parse_yy.c grammar.tab.c
 libgstparse_la_CFLAGS = $(GST_CFLAGS) $(DISABLE_FLEX_WARNING)
 libgstparse_la_LIBADD = $(LIBGST_LIBS)

diff --git a/gst/parse/parse.l b/gst/parse/parse.l
index 7523729..c505206 100644 (file)
--- a/gst/parse/parse.l
+++ b/gst/parse/parse.l
@@ -25,7 +25,6 @@
 #endif // G_HAVE_ISO_VARARGS
 
 #define YY_DECL int _gst_parse_yylex (YYSTYPE *lvalp)
-#define YY_NO_UNPUT
 %}
 
 _operators [(){}.:!,=]
@@ -47,6 +46,7 @@ _binref {_identifier}[[:space:]]*"."[[:space:]]*"("
 
 %x value
 %option noyywrap
+%option nounput
 %%
 
 {_assignment} {