From 82fafc48890492688276abba53b490ed8cc0575c Mon Sep 17 00:00:00 2001 From: mquinson Date: Wed, 23 Feb 2005 22:03:51 +0000 Subject: [PATCH 1/1] React healthily when flex is not there or is too old (code stolen from automake directly) git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@1068 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- acmacro/flex.m4 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/acmacro/flex.m4 b/acmacro/flex.m4 index 0f66a94d2e..920f752de8 100644 --- a/acmacro/flex.m4 +++ b/acmacro/flex.m4 @@ -11,10 +11,12 @@ 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 @@ -38,7 +40,7 @@ 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, '') fi fi -- 2.20.1