Support recent Mac OS X flex --version strings.

diff --git a/configure b/configure
index de73b08fa65ac193926df5f19bbdce9d577d0b47..a7c40d1f277cb676c4322e28864ec35689277043 100755 (executable)
--- a/configure
+++ b/configure
@@ -11173,7 +11173,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_FLEX="$as_dir/$ac_prog$ac_exec_ext"
       { test -f "$ac_path_FLEX" && $as_test_x "$ac_path_FLEX"; } || continue
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_FLEX="$as_dir/$ac_prog$ac_exec_ext"
       { test -f "$ac_path_FLEX" && $as_test_x "$ac_path_FLEX"; } || continue

-as_arg_v1=`$ac_path_FLEX --version | $SED -e '1 s/^.* \([0-9.]*\)$/\1/p;d'`
+as_arg_v1=`$ac_path_FLEX --version | $SED -e '1 s/^[^0-9.]* \([0-9.]*\).*$/\1/p;d'`

 as_arg_v2=2.5.33
 awk "$as_awk_strverscmp" v1="$as_arg_v1" v2="$as_arg_v2" /dev/null
 case $? in #(
 as_arg_v2=2.5.33
 awk "$as_awk_strverscmp" v1="$as_arg_v1" v2="$as_arg_v2" /dev/null
 case $? in #(

diff --git a/configure.ac b/configure.ac
index 3900105a4077ee244d874aa2dd55b46b9434413b..5a558e894b12b128ad3b43f7c60cad7d3eb4c82b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@ CY_CHECK_PROGS_VERSION([BISON], [bison], [bison],
        [-V | $SED -e '1 s/^bison (GNU Bison) \(.*\)$/\1/p;d'], [2.3])
 AC_ARG_VAR([FLEX], [the fast lexical analyser generator])
 CY_CHECK_PROGS_VERSION([FLEX], [flex], [flex],
        [-V | $SED -e '1 s/^bison (GNU Bison) \(.*\)$/\1/p;d'], [2.3])
 AC_ARG_VAR([FLEX], [the fast lexical analyser generator])
 CY_CHECK_PROGS_VERSION([FLEX], [flex], [flex],

-       [--version | $SED -e '1 s/^.* \(@<:@0-9.@:>@*\)$/\1/p;d'], [2.5.33])
+       [--version | $SED -e '1 s/^@<:@^0-9.@:>@* \(@<:@0-9.@:>@*\).*$/\1/p;d'], [2.5.33])

 AC_ARG_VAR([GPERF], [perfect hash function generator])
 CY_CHECK_PROGS_VERSION([GPERF], [gperf], [gperf],
        [--version | $SED -e '1 s/^.* \(@<:@0-9.@:>@*\)$/\1/p;d'], [3.0.3])
 AC_ARG_VAR([GPERF], [perfect hash function generator])
 CY_CHECK_PROGS_VERSION([GPERF], [gperf], [gperf],
        [--version | $SED -e '1 s/^.* \(@<:@0-9.@:>@*\)$/\1/p;d'], [3.0.3])