If the user wants to force the use of ucontext on a box where they are not usable...

[simgrid.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 35410a2..e019a2e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -84,9 +84,7 @@ dnl #
 
 dnl #  check for MCSC method
 AC_MSG_CHECKING(on top of what can we build the contexts)
-AC_CHECK_HEADER(ucontext.h,,, [#include <sys/types.h>])
-AC_CHECK_FUNCS(makecontext swapcontext getcontext setcontext)
-AC_CHECK_MCSC(mcsc=yes, mcsc=no)
+AC_CHECK_MCSC(mcsc=yes, mcsc=no) 
 
 dnl #  check for pthread method
 AC_CHECK_HEADERS([pthread.h])
@@ -121,12 +119,17 @@ AC_ARG_WITH(pthread, [  --with-pthread   Use pthread instead of ucontext.],with_
 AC_ARG_WITH(context,
   [  --with-context=[ucontext/pthread]   Use either (System V) swapcontext or pthread [[default=auto]].],,
   with_context=auto)
+
+if test "x$with_context$mcsc" = "xucontextno" ; then 
+  AC_MSG_ERROR([--with-context=ucontext specified but ucontext unusable. Relaunch configure without this argument.], 77)
+fi
+
 case $with_context in
  ucontext) ;;
  pthread) ;;
  windows) ;;
  auto) with_context=ucontext;;
- *) AC_MSG_ERROR("--with-context must be either ucontext or pthread") ;;
+ *) AC_MSG_ERROR([--with-context must be either ucontext or pthread]) ;;
 esac
 
 if test "x$with_context" = "xucontext" ; then
@@ -293,8 +296,25 @@ AC_CONFIG_FILES([
   src/ucontext_stack.h
 ])
 
+# Tools being embeeded in gramine (stub generator)
+AC_CONFIG_FILES([
+  tools/Makefile
+    tools/gras/Makefile
+])
+
 # GRAMINE_CUT_BEGIN
 
+# Tools NOT being embeeded in gramine
+AC_CONFIG_FILES([
+  tools/graspe-slave
+],[
+    for file in                                                 \
+     tools/graspe-slave           tools/graspe-master           \
+    ; do                                                        \
+      test -e $file && chmod +x $file;                          \
+    done
+])
+
 # Testsuite
 
 AC_CONFIG_FILES([  
@@ -310,7 +330,13 @@ AC_CONFIG_FILES([
     done
 ])
 
-# Examples, documentation and tools
+# Documentation
+AC_CONFIG_FILES([
+  doc/Makefile
+  doc/Doxyfile
+])
+
+# Examples
 
 AC_CONFIG_FILES([
   examples/Makefile 
@@ -333,13 +359,8 @@ AC_CONFIG_FILES([
     examples/amok/Makefile       
       examples/amok/bandwidth/Makefile examples/amok/bandwidth/test_sg examples/amok/bandwidth/test_rl
       examples/amok/saturate/Makefile  examples/amok/saturate/test_sg  examples/amok/saturate/test_rl
-  doc/Makefile
-    doc/Doxyfile
-  tools/graspe-slave            tools/Makefile
-    tools/gras/Makefile
 ],[
     for file in                                                 \
-     tools/graspe-slave           tools/graspe-master           \
      \
      examples/amok/bandwidth/test_sg examples/amok/bandwidth/test_rl \
      examples/amok/saturate/test_sg  examples/amok/saturate/test_rl \
@@ -361,7 +382,6 @@ AC_CONFIG_FILES([
     done
 ])
 
-
 #     examples/gras/chord/test_sg  examples/gras/chord/test_rl   \
 #    examples/gras/pastry/test_sg