From 3d615cf194cbec84c5819c1d7888b6975b440151 Mon Sep 17 00:00:00 2001
From: mquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Fri, 4 Feb 2005 11:28:05 +0000
Subject: [PATCH] Use the new AC_PROG_FLEX macro, move it to the right
 configure.ac section (where we test for progs)

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@859 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---
 configure.ac | 54 +++++++++++-----------------------------------------
 1 file changed, 11 insertions(+), 43 deletions(-)

diff --git a/configure.ac b/configure.ac
index a9b95254f5..7ad0ac2be3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,9 +19,6 @@ AC_CONFIG_MACRO_DIR(acmacro)
 # It seems to be called ACLOCAL_INCLUDE...
 # A M_ACLOCAL_INCLUDE(acmacro)
 
-
-
-
 AC_PROG_LIBTOOL
 
 # declare the modules (no optional module)
@@ -63,46 +60,6 @@ AC_TYPE_SIZE_T
 dnl A C_FUNC_MEMCMP
 dnl A C_CHECK_FUNCS([memset strchr strerror usleep])
 
-# Can we rebuild the parsers?
-# We really want flex and refuse other lex. So, the parser is portable and
-# does not induce extra lib dependency
-AC_PROG_LEX
-if test "$LEX" != flex; then
-  AC_MSG_NOTICE([Will not rebuild the parsers. I want flex.])
-  LEX="$SHELL $missing_dir/missing flex";
-else
-changequote(<<, >>)dnl because of the regexp [[:blank:]]  
-  FLEX_VERSION=`flex --version`;
-  FLEX_VER_MAJ=`echo $FLEX_VERSION | sed 's/[^0-9\.]*//g' | sed 's/\..*//g'`;
-  FLEX_VER_MED=`echo $FLEX_VERSION | sed 's/[^0-9\.]*//g' | sed 's/[0-9]*\.\([0-9]*\)\.[0-9]*/\1/g'`;
-  FLEX_VER_MIN=`echo $FLEX_VERSION | sed 's/[^0-9\.]*//g' | sed 's/.*\.//g'`;
-changequote([, ])dnl back to normality, there is no regexp afterward
-  if test $FLEX_VER_MAJ -lt 2 ; then
-    AC_MSG_NOTICE([Will not rebuild the parsers. Your flex is too old.])
-    LEX="$SHELL $missing_dir/missing flex";
-  else
-    if test $FLEX_VER_MAJ -eq 2 ; then
-      if test $FLEX_VER_MED -lt 5 ; then
-        AC_MSG_NOTICE([Will not rebuild the parsers. Your flex is too old.])
-        LEX="$SHELL $missing_dir/missing flex";
-      else
-        if test $FLEX_VER_MED -eq 5 ; then
-          if test $FLEX_VER_MIN -lt 31 ; then
-             AC_MSG_NOTICE([Will not rebuild the parsers. Your flex is too old.])
-             LEX="$SHELL $missing_dir/missing flex";
-          fi;
-        fi;
-      fi;
-    fi;
-  fi;
-fi
-		
-# Can we rebuild the xml-lexers from the XML specification?
-# if not, simply touch the flex source files (which are distributed in
-#  tarballs even if generated by flexml) and hope for the best.
-AC_CHECK_PROG(FLEXML,flexml,,NOTFOUND)
-AM_CONDITIONAL(HAVE_FLEXML,test x$FLEXML != NOTFOUND)
-
 dnl ####[ Search libs ]#######################################################
 dnl A CI_PACKAGE([S imGrid],[the SimGrid simulator],[SG_init],[-lsimgrid],[simgrid.h],,:)
 dnl A M_CONDITIONAL(HAVE_SG,test x$HAVE_SimGrid = xyes)
@@ -148,6 +105,17 @@ AC_CHECK_PROG(BASH, bash, `which bash`, /bin/sh)
 WARNING="This file is generated, do not edit"
 AC_SUBST(WARNING)
 
+# Can we rebuild the parsers?
+# We really want flex and refuse other lex. So, the parser is portable and
+# does not induce extra lib dependency
+AC_PROG_FLEX(2.5.30)
+		
+# Can we rebuild the xml-lexers from the XML specification?
+# if not, simply touch the flex source files (which are distributed in
+#  tarballs even if generated by flexml) and hope for the best.
+AC_CHECK_PROG(FLEXML,flexml,,NOTFOUND)
+AM_CONDITIONAL(HAVE_FLEXML,test x$FLEXML != NOTFOUND)
+
 dnl ####[ Makes the output ]###################################################
 #    examples/bandwidth/Makefile examples/bandwidth/test_sg
 #    examples/pastry/Makefile    examples/pastry/test_sg
-- 
2.20.1