X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f6ac78b3b68e90973da62167c4358bed0c5401c5..8dd91b297674117ccfc54e663b37fdf99da0213f:/configure.ac

diff --git a/configure.ac b/configure.ac
index db59858e06..3cbb56a457 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ(2.59)
 # We need a recent ACI
 # A CI_PREREQ(2003.01.16)
 
-AC_INIT([simgrid],[2.91],[simgrid2-users@listes.ens-lyon.fr])
+AC_INIT([simgrid],[2.93-cvs],[simgrid2-users@listes.ens-lyon.fr])
 AC_CONFIG_SRCDIR([include/gras.h])
 AC_CONFIG_HEADERS([src/gras_config.h])
 
@@ -44,12 +44,43 @@ AC_HEADER_TIME
 AC_CHECK_HEADERS([sys/socket.h winsock.h winsock2.h \
                   sys/stat.h \
 		  ucontext.h \
+		  pthread.h \
+		  windows.h \
 		  sys/time.h \
 		  errno.h unistd.h ])
-AC_CHECK_FUNCS([gettimeofday \
+AC_CHECK_FUNCS([gettimeofday usleep \
                 getdtablesize \
                 sysconf])
 
+AC_ARG_ENABLE(context,
+  [  --enable-context=[ucontext/pthread]   Use either (System V) swapcontext or pthread [[default=ucontext]].],,
+  enable_context=ucontext)
+AC_MSG_CHECKING(on top of what can we build the contexts)
+if test "x$enable_context" = "xucontext"; then
+  ac_header=ucontext.h
+  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+  if test `eval echo '${'$as_ac_Header'}'` = yes; then
+    AC_MSG_RESULT(found ucontext.h. Great!)
+  else
+    ac_header=windows.h
+    as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+    if test `eval echo '${'$as_ac_Header'}'` = yes; then
+      AC_MSG_RESULT(you don't have ucontext.h but we provide an alternative for windows so you should be fine.")
+    else
+      AC_MSG_RESULT([[cannot find ucontext. I'm going to try as if you had set --enable-context=pthreads !]])
+      enable_context=pthreads
+    fi
+  fi
+else if test "x$enable_context" = "xpthread"; then
+  AC_CHECK_LIB(pthread,pthread_create,,
+    [AC_MSG_ERROR([[Cannot find pthreads, no way (try --enable-context=ucontext if you haven't already tried).]])])
+  AC_DEFINE([USE_PTHREADS],1,[Define if we USE pthreads or not])
+  AC_MSG_RESULT(You have pthreads. Let's use them.)
+else 
+  AC_MSG_ERROR("--enable-context must be either ucontext or pthread")
+fi fi
+
+
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_C_INLINE
@@ -125,27 +156,36 @@ AC_CONFIG_FILES([
   src/Makefile
   src/amok/Makefile
   examples/Makefile 
-    examples/msg/Makefile 
-    examples/gras/ping/Makefile      examples/gras/ping/test_sg     examples/gras/ping/test_rl
+    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
     doc/Doxyfile.main           doc/Doxyfile.API          doc/Doxyfile.Examples   
-  tools/compile-remote-worker
+  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/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;
+    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