Michael Stefaniuc : configure: Require a new enough flex version.
Alexandre Julliard
julliard at winehq.org
Wed Dec 30 10:18:14 CST 2009
Module: wine
Branch: master
Commit: ce30733337e55d76c3870f5724cd995e980e4756
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce30733337e55d76c3870f5724cd995e980e4756
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Tue Dec 29 18:07:02 2009 +0100
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(+), 0 deletions(-)
diff --git a/configure b/configure
index 3e5f93e..e0ae0d2 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 b75d74c..9178306 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)
More information about the wine-cvs
mailing list