summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederic Peters <fpeters@entrouvert.com>2006-07-24 12:11:10 +0000
committerTim-Philipp Müller <tim@centricular.net>2006-07-24 12:11:10 +0000
commitef97fb3278d98a1fdb32e5c6b2a7467116ffc160 (patch)
treed21fdeee7127a2a220414256b6ea60bd97d44b23
parent743c74bf92546638d3f4272fd5525bf6ef71f794 (diff)
m4/gst-parser.m4: Need to double square brackets in .m4 files. Should fix bison version detection with version number...RELEASE-0_10_2
Original commit message from CVS: Patch by: Frederic Peters <fpeters at entrouvert com> * m4/gst-parser.m4: Need to double square brackets in .m4 files. Should fix bison version detection with version numbers like 1.23a (#348354).
-rw-r--r--ChangeLog8
-rw-r--r--m4/gst-parser.m44
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 2044053..9e6017d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-07-24 Tim-Philipp Müller <tim at centricular dot net>
+
+ Patch by: Frederic Peters <fpeters at entrouvert com>
+
+ * m4/gst-parser.m4:
+ Need to double square brackets in .m4 files. Should fix bison
+ version detection with version numbers like 1.23a (#348354).
+
2006-07-24 Jan Schmidt <thaytan@mad.scientist.com>
* check.mak:
diff --git a/m4/gst-parser.m4 b/m4/gst-parser.m4
index 56b43bc..87628fa 100644
--- a/m4/gst-parser.m4
+++ b/m4/gst-parser.m4
@@ -9,7 +9,7 @@ AC_DEFUN([GST_BISON_CHECK],
dnl check bison version
bison_min_version=1.35
- bison_version=`$BISON_PATH --version | head -n 1 | sed 's/^.*) //' | tr -d '[:alpha:]' | cut -d' ' -f1`
+ bison_version=`$BISON_PATH --version | head -n 1 | sed 's/^.*) //' | tr -d '[[:alpha:]]' | cut -d' ' -f1`
AC_MSG_CHECKING([bison version $bison_version >= $bison_min_version])
if perl -w <<EOF
@@ -34,7 +34,7 @@ AC_DEFUN([GST_FLEX_CHECK],
dnl check flex version
flex_min_version=2.5.6
- flex_version=`$FLEX_PATH --version | head -n 1 | sed 's/^.* //' | tr -d '[:alpha:]' | cut -d' ' -f1`
+ flex_version=`$FLEX_PATH --version | head -n 1 | sed 's/^.* //' | tr -d '[[:alpha:]]' | cut -d' ' -f1`
AC_MSG_CHECKING([flex version $flex_version >= $flex_min_version])
if perl -w <<EOF
(\$min_version_major, \$min_version_minor, \$min_version_micro ) = "$flex_min_version" =~ /(\d+)\.(\d+)\.(\d+)/;