Check for usleep since gras_virtu needs it

[simgrid.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 1fc372f..4d70941 100644 (file)
--- 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.92-cvs],[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)
@@ -50,7 +46,7 @@ AC_CHECK_HEADERS([sys/socket.h winsock.h winsock2.h \
                  ucontext.h \
                  sys/time.h \
                  errno.h unistd.h ])
-AC_CHECK_FUNCS([gettimeofday \
+AC_CHECK_FUNCS([gettimeofday usleep \
                 getdtablesize \
                 sysconf])
 
@@ -63,20 +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
-  LEX="$SHELL $missing_dir/missing flex"
-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)
@@ -122,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
@@ -132,30 +125,41 @@ 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/msg/Makefile          examples/msg/run_msg_test
+    examples/gras/Makefile 
+      examples/gras/ping/Makefile  examples/gras/ping/test_sg  examples/gras/ping/test_rl
+      examples/gras/timer/Makefile examples/gras/timer/test_sg examples/gras/timer/test_rl
+      examples/gras/chrono/Makefile examples/gras/chrono/test_sg examples/gras/chrono/test_rl
   doc/Makefile
-  tools/compile-remote-worker
+    doc/Doxyfile.main           doc/Doxyfile.API          doc/Doxyfile.Examples   
+  tools/compile-remote-worker tools/Makefile
+    tools/gras/Makefile
   testsuite/Makefile
   testsuite/run_tests    
   testsuite/gras/trp_tcp_usage
   testsuite/gras/trp_file_usage
 ],[
-     test -e testsuite/run_tests          && chmod +x testsuite/run_tests;
-     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;
-     chmod +x $srcdir/tools/gras-check-arch;
+    for file in                                                 \
+     testsuite/run_tests                                        \
+     testsuite/gras/trp_tcp_usage testsuite/gras/trp_file_usage \
+     tools/compile-remote-worker                                \
+     examples/msg/run_msg_test                                  \
+     examples/gras/ping/test_sg   examples/gras/ping/test_rl    \
+     examples/gras/timer/test_sg  examples/gras/timer/test_rl   \
+     examples/gras/chrono/test_sg  examples/gras/chrono/test_rl \
+    ; do                                                        \
+      test -e $file && chmod +x $file;                          \
+    done
+    chmod +x $srcdir/tools/gras-check-arch;
 ])
 
+#    examples/gras/pastry/test_sg   
+#    examples/gras/bandwidth/test_sg 
+
 
 
-#    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