m4/gst-parser.m4: Unconditionally require flex 2.5.31 and bison 1.875.

Original commit message from CVS:
* m4/gst-parser.m4:
Unconditionally require flex 2.5.31 and bison 1.875.

diff --git a/ChangeLog b/ChangeLog
index 9b90716..1f885aa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-01  Sebastian Dröge  <slomo@circular-chaos.org>
+
+       * m4/gst-parser.m4:
+       Unconditionally require flex 2.5.31 and bison 1.875.
+
 2008-03-23  Sebastian Dröge  <slomo@circular-chaos.org>
 
        * m4/gst-arch.m4:

diff --git a/m4/gst-parser.m4 b/m4/gst-parser.m4
index 9cc0981..8bac242 100644 (file)
--- a/m4/gst-parser.m4
+++ b/m4/gst-parser.m4
@@ -8,9 +8,8 @@ AC_DEFUN([AG_GST_BISON_CHECK],
   fi
 
   dnl check bison version
-  dnl FIXME 0.11: we need version >= 1.875 for the reentrancy support
-  dnl in the parser. If an older version is installed pre-generated
-  dnl sources are used. This should become a hard dependency for 0.11!
+  dnl we need version >= 1.875 for the reentrancy support
+  dnl in the parser.
   bison_min_version=1.875
   bison_version=`$BISON_PATH --version | head -n 1 | sed 's/^.*) //' | sed 's/[[a-zA-Z]]*$//' | cut -d' ' -f1`
   AC_MSG_CHECKING([bison version $bison_version >= $bison_min_version])
@@ -20,10 +19,8 @@ AC_DEFUN([AG_GST_BISON_CHECK],
 EOF 
   then 
     AC_MSG_RESULT([yes])
-    AM_CONDITIONAL(GENERATE_PARSER, test -z $GENERATE_PARSER_TRUE)
   else 
-    AC_MSG_RESULT([no, using pre-generated parser sources])
-    AM_CONDITIONAL(GENERATE_PARSER, false)
+    AC_MSG_ERROR([no])
   fi
 ])
 
@@ -36,9 +33,8 @@ AC_DEFUN([AG_GST_FLEX_CHECK],
   fi
   
   dnl check flex version
-  dnl FIXME 0.11: we need version >= 2.5.31 for the reentrancy support
-  dnl in the parser. If an older version is installed pre-generated
-  dnl sources are used. This should become a hard dependency for 0.11!
+  dnl we need version >= 2.5.31 for the reentrancy support
+  dnl in the parser. 
   flex_min_version=2.5.31
   flex_version=`$FLEX_PATH --version | head -n 1 | sed 's/^.* //' | sed 's/[[a-zA-Z]]*$//' | cut -d' ' -f1`
   AC_MSG_CHECKING([flex version $flex_version >= $flex_min_version])
@@ -55,9 +51,7 @@ AC_DEFUN([AG_GST_FLEX_CHECK],
 EOF
   then
     AC_MSG_RESULT(yes)
-    AM_CONDITIONAL(GENERATE_PARSER, test -z $GENERATE_PARSER_TRUE)
   else
-    AC_MSG_RESULT([no, using pre-generated parser sources])
-    AM_CONDITIONAL(GENERATE_PARSER, false)
+    AC_MSG_ERROR([no])
   fi
 ])