From ce30733337e55d76c3870f5724cd995e980e4756 Mon Sep 17 00:00:00 2001
From: Michael Stefaniuc <mstefani@redhat.de>
Date: Tue, 29 Dec 2009 18:07:02 +0100
Subject: [PATCH] configure: Require a new enough flex version.

Wine needs a newer flex version than the prediluvian 2.5.4a.
---
 configure    | 17 +++++++++++++++++
 configure.ac | 14 ++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/configure b/configure
index 3e5f93e632a..e0ae0d2d8ff 100755
--- a/configure
+++ b/configure
@@ -4214,6 +4214,23 @@ if test "$FLEX" = "none"
 then
   as_fn_error "no suitable flex found. Please install the 'flex' package." "$LINENO" 5
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether flex is recent enough" >&5
+$as_echo_n "checking whether flex is recent enough... " >&6; }
+cat >conftest.l <<EOF
+%top{
+#include "prediluvian.h"
+}
+%%
+EOF
+if $FLEX -t conftest.l >/dev/null 2>&1
+then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+  as_fn_error "Your flex version is too old. Please install flex version 2.5.33 or newer." "$LINENO" 5
+fi
 
 for ac_prog in bison
 do
diff --git a/configure.ac b/configure.ac
index b75d74ccb68..9178306136c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -230,6 +230,20 @@ if test "$FLEX" = "none"
 then
   AC_MSG_ERROR([no suitable flex found. Please install the 'flex' package.])
 fi
+AC_MSG_CHECKING([whether flex is recent enough])
+cat >conftest.l <<EOF
+%top{
+#include "prediluvian.h"
+}
+%%
+EOF
+if $FLEX -t conftest.l >/dev/null 2>&1
+then
+  AC_MSG_RESULT([yes])
+else
+  AC_MSG_RESULT([no])
+  AC_MSG_ERROR([Your flex version is too old. Please install flex version 2.5.33 or newer.])
+fi
 
 dnl Check for bison
 AC_CHECK_PROGS(BISON,bison,none)
-- 
2.11.4.GIT