diff options
| author | Sebastian Dröge <slomo@circular-chaos.org> | 2007-04-18 12:34:20 +0000 |
|---|---|---|
| committer | Sebastian Dröge <slomo@circular-chaos.org> | 2007-04-18 12:34:20 +0000 |
| commit | dae6fa1f592c9231820c2135b8b1b3c2b0875ef6 (patch) | |
| tree | 2ca917e1d0dd53012b2915be2acf5910aede2bb8 | |
| parent | 380281f0da9caa065cfe99a458b3538cc3f5d71a (diff) | |
m4/:
Original commit message from CVS:
reviewed by: <delete if not using a buddy>
* ChangeLog:
* m4/gst-parser.m4:
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | m4/gst-parser.m4 | 12 |
2 files changed, 22 insertions, 5 deletions
@@ -1,3 +1,18 @@ +2007-04-18 Sebastian Dröge <slomo@circular-chaos.org> + + reviewed by: <delete if not using a buddy> + + * ChangeLog: + * m4/gst-parser.m4: + +2007-04-18 Sebastian Dröge <slomo@circular-chaos.org> + + * m4/gst-parser.m4: + Check for flex >= 2.5.31 and set GENERATE_PARSER if we have at least + that version. Otherwise use pre-generated parser sources as we can't + raise the required flex version. HAVE_MT_SAVE_FLEX is obsolete now + as we use a new enough flex version anyway. First part of #349180 + 2007-04-10 Thomas Vander Stichele <thomas at apestaart dot org> * m4/gst-check.m4: diff --git a/m4/gst-parser.m4 b/m4/gst-parser.m4 index 46f9041..89763f5 100644 --- a/m4/gst-parser.m4 +++ b/m4/gst-parser.m4 @@ -26,14 +26,16 @@ EOF AC_DEFUN([AG_GST_FLEX_CHECK], [ dnl we require flex for building the parser - dnl FIXME: check if AC_PROG_LEX is suitable here AC_PATH_PROG(FLEX_PATH, flex, no) if test x$FLEX_PATH = xno; then AC_MSG_ERROR(Could not find flex) fi dnl check flex version - flex_min_version=2.5.6 + 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! + 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]) if perl -w <<EOF @@ -49,9 +51,9 @@ AC_DEFUN([AG_GST_FLEX_CHECK], EOF then AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_MT_SAVE_FLEX, 1, - [Defined if we have recent enough flex, which is MT save]) + AM_CONDITIONAL(GENERATE_PARSER, true) else - AC_MSG_RESULT(no) + AC_MSG_RESULT(no, using pre-generated parser sources) + AM_CONDITIONAL(GENERATE_PARSER, false) fi ]) |