Do connect all log channel manually to parent using XBT_LOG_CONNECT() too, so that...

[simgrid.git] / acmacro / flex.m4

diff --git a/acmacro/flex.m4 b/acmacro/flex.m4
index 3f1c4e8..b7b0fe6 100644 (file)
--- a/acmacro/flex.m4
+++ b/acmacro/flex.m4
@@ -3,6 +3,14 @@ dnl The first arg must be a version number with 3 parts.
 
 dnl You may want to check for version >= 2.5.31 (the one breaking posix compatibility)
 
+
+dnl Copyright (C) 2005. Martin Quinson. All rights reserved.
+
+dnl This file is part of the SimGrid project. This is free software: 
+dnl You can redistribute and/or modify it under the terms of the 
+dnl GNU LGPL (v2.1) licence.
+
+
 AC_DEFUN([_AC_PROG_FLEX_HELPER_TOO_OLD],[
   AC_MSG_NOTICE([Found flex is too old. Parsers won't get updated (Found v$FLEX_VERSION < v$1)])
   LEX="$SHELL $missing_dir/missing flex";
@@ -11,17 +19,18 @@ AC_DEFUN([_AC_PROG_FLEX_HELPER_TOO_OLD],[
 
 AC_DEFUN([AC_PROG_FLEX],
  [
-  AC_PROG_LEX
+AC_PREREQ(2.50)dnl
+AC_REQUIRE([AM_MISSING_HAS_RUN])dnl
+AC_REQUIRE([AC_PROG_LEX])dnl
   if test "$LEX" != flex; then
     AC_MSG_NOTICE([Flex not found. Parsers won't get updated.])
-    LEX="$SHELL $missing_dir/missing flex";
+    LEX=${am_missing_run}flex
     AC_SUBST(LEXLIB, '')
   else
     if test "x$1" != "x" ; then
       dnl
       dnl We were asked to check the version number
       dnl
-      set -x
       changequote(<<, >>)dnl because of the regexp [blabla]
       FLEX_VERSION=`flex --version | sed -e 's/^[^0-9]*//' -e 's/[^0-9]*$//'`
 
@@ -39,12 +48,11 @@ AC_DEFUN([AC_PROG_FLEX],
          test "$FLEX_VER_MAJ" -eq "$WANT_VER_MAJ" -a "$FLEX_VER_MED" -eq "$WANT_VER_MED" -a "$FLEX_VER_MIN" -lt "$WANT_VER_MIN" ;
       then
         AC_MSG_NOTICE([Found flex is too old. Parsers won't get updated (Found v$FLEX_VERSION < v$1)])
-        LEX="$SHELL $missing_dir/missing flex";
+        LEX=${am_missing_run}flex
         AC_SUBST(LEXLIB, '')
+      else
+        AC_MSG_NOTICE([Flex found. Parsers will get updated])      
       fi
-      set +x
     fi
   fi
-  AC_MSG_NOTICE([Flex found. Parsers will get updated])
-  exit 0
 ])