X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3fdf4688dcb2bbde0f0d651f36fe1ec56b8b51a2..d905a08af01043d82f0597dc8e6e1245a54405de:/configure.ac

diff --git a/configure.ac b/configure.ac
index 98c1e1233e..b662e90611 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,9 @@
 AC_PREREQ(2.59)
 
-#We need a recent ACI
-ACI_PREREQ(2003.01.16)
+# We need a recent ACI
+# A CI_PREREQ(2003.01.16)
 
-AC_INIT([simgrid],[2.90],[arnaud.legrand@imag.fr])
-#AC_INIT([GRAS],[0.7],[martin.quinson@ens-lyon.fr])
+AC_INIT([simgrid],[2.91],[simgrid2-users@listes.ens-lyon.fr])
 AC_CONFIG_SRCDIR([include/gras.h])
 AC_CONFIG_HEADERS([src/gras_config.h])
 
@@ -19,9 +18,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 +59,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 +104,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
@@ -158,8 +125,9 @@ AC_CONFIG_FILES([
   src/Makefile
   src/amok/Makefile
   examples/Makefile 
-    examples/ping/Makefile      examples/ping/test_sg     examples/ping/test_rl
     examples/msg/Makefile 
+    examples/gras/Makefile 
+      examples/gras/ping/Makefile  examples/gras/ping/test_sg  examples/gras/ping/test_rl
   doc/Makefile
     doc/Doxyfile.main           doc/Doxyfile.API          doc/Doxyfile.Examples   
   tools/compile-remote-worker
@@ -172,17 +140,18 @@ AC_CONFIG_FILES([
      test -e testsuite/gras/trp_tcp_usage && chmod +x testsuite/gras/trp_tcp_usage;
      test -e testsuite/gras/trp_file_usage&& chmod +x testsuite/gras/trp_file_usage;
      test -e tools/compile-remote-worker  && chmod +x tools/compile-remote-worker;
-     test -e examples/ping/test_sg        && chmod +x examples/ping/test_sg;
-     test -e examples/ping/test_rl        && chmod +x examples/ping/test_rl;
-#     test -e examples/bandwidth/test_sg   && chmod +x examples/bandwidth/test_sg;
-     test -e examples/pastry/test_sg      && chmod +x examples/pastry/test_sg;
+     test -e examples/gras/ping/test_sg   && chmod +x examples/gras/ping/test_sg;
+     test -e examples/gras/ping/test_rl   && chmod +x examples/gras/ping/test_rl;
+#     test -e examples/gras/bandwidth/test_sg   && chmod +x examples/gras/bandwidth/test_sg;
+     test -e examples/gras/pastry/test_sg && chmod +x examples/gras/pastry/test_sg;
      chmod +x $srcdir/tools/gras-check-arch;
 ])
 
 
 
-#    examples/saturate/Makefile  examples/saturate/test_sg
-#    examples/alnem/Makefile     examples/alnem/test_sg
+
+#    examples/gras/saturate/Makefile  examples/gras/saturate/test_sg
+#    examples/gras/alnem/Makefile     examples/gras/alnem/test_sg