Do not check our context code on hosts where configure decided not to use it (or...

[simgrid.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 1622de7..199a68e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 ##
 
 AC_PREREQ(2.59)
-AC_INIT([simgrid],[3.1-cvs],[simgrid-devel@lists.gforge.inria.fr])
+AC_INIT([simgrid],[3.1.1-cvs],[simgrid-devel@lists.gforge.inria.fr])
 AC_CONFIG_SRCDIR([include/gras.h])
 AC_CONFIG_HEADERS([src/gras_config.h])
 # A CI_PREREQ(2003.01.16) # We need a recent ACI when having sub-modules
@@ -128,10 +128,12 @@ case $with_context in
  *) AC_MSG_ERROR("--with-context must be either ucontext or pthread") ;;
 esac
 
+USE_CONTEXT=no
 if test "x$with_context" = "xucontext" ; then
   if test ".$mcsc" = .yes; then
     AC_MSG_RESULT(found working ucontext. Great!)
     AC_DEFINE([USE_UCONTEXT],1,[Define if we use ucontext or not])
+    USE_CONTEXT=yes
   else
     if test ".$windows_context" = .yes ; then
       AC_MSG_RESULT(use windows context portability layer.)
@@ -142,6 +144,7 @@ if test "x$with_context" = "xucontext" ; then
     fi
   fi
 fi
+AC_SUBST(USE_CONTEXT)
 
 if test "x$with_context" = "xpthread"; then
   AC_CHECK_HEADERS([pthread.h])
@@ -272,7 +275,7 @@ AC_CONFIG_FILES([
       examples/gras/rpc/Makefile    examples/gras/rpc/test_sg    examples/gras/rpc/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
-      examples/gras/tokenS/Makefile examples/gras/tokenS/test_sg examples/gras/tokenS/test_rl
+      examples/gras/mutual_exclusion/simple_token/Makefile examples/gras/mutual_exclusion/simple_token/test_sg examples/gras/mutual_exclusion/simple_token/test_rl
       examples/gras/mmrpc/Makefile  examples/gras/mmrpc/test_sg  examples/gras/mmrpc/test_rl
       examples/gras/pmm/Makefile    examples/gras/pmm/test_sg    examples/gras/pmm/test_rl
       examples/gras/all2all/Makefile examples/gras/all2all/test_sg examples/gras/all2all/test_rl
@@ -304,7 +307,7 @@ AC_CONFIG_FILES([
      examples/gras/rpc/test_sg    examples/gras/rpc/test_rl     \
      examples/gras/timer/test_sg  examples/gras/timer/test_rl   \
      examples/gras/chrono/test_sg examples/gras/chrono/test_rl  \
-     examples/gras/tokenS/test_sg examples/gras/tokenS/test_rl  \
+     examples/gras/mutual_exclusion/simple_token/test_sg examples/gras/mutual_exclusion/simple_token/test_rl  \
      examples/gras/mmrpc/test_sg  examples/gras/mmrpc/test_rl   \
      examples/gras/pmm/test_sg    examples/gras/pmm/test_rl     \
      examples/gras/all2all/test_sg  examples/gras/all2all/test_rl   \