From 8cd1ce21ffab6ee43980c4112ae2bd1c84a7aad0 Mon Sep 17 00:00:00 2001
From: Conrad Kramer <conrad@kramerapps.com>
Date: Sat, 1 Sep 2012 15:25:29 -0700
Subject: [PATCH] Support recent Mac OS X flex --version strings.

---
 configure    | 2 +-
 configure.ac | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index de73b08..a7c40d1 100755
--- 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
-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 #(
diff --git a/configure.ac b/configure.ac
index 3900105..5a558e8 100644
--- 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],
-	[--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])
-- 
2.47.2