From: Martin Quinson <martin.quinson@loria.fr>
Date: Fri, 30 Oct 2015 09:53:04 +0000 (+0100)
Subject: Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
X-Git-Tag: v3_13~1616
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/6a6c1a432ee6568c58d74d31746544e6afabdf6f?hp=8d049994769ca901e12184f529e2af4410bc1c4c

Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
---

diff --git a/src/simix/smx_context.c b/src/simix/smx_context.c
index 72d96313be..a801c0451b 100644
--- a/src/simix/smx_context.c
+++ b/src/simix/smx_context.c
@@ -96,12 +96,17 @@ void SIMIX_context_mod_init(void)
 #ifdef HAVE_RAWCTX
         XBT_ERROR("  raw: high performance context factory implemented specifically for SimGrid");
 #else
-        XBT_ERROR("  (raw contexts are disabled at compilation time on this machine -- check configure logs for details)");
+        XBT_ERROR("  (raw contexts were disabled at compilation time on this machine -- check configure logs for details)");
 #endif
 #ifdef CONTEXT_UCONTEXT
         XBT_ERROR("  ucontext: classical system V contexts (implemented with makecontext, swapcontext and friends)");
 #else
-        XBT_ERROR("  (ucontext is disabled at compilation time on this machine -- check configure logs for details)");
+        XBT_ERROR("  (ucontext was disabled at compilation time on this machine -- check configure logs for details)");
+#endif
+#ifdef HAVE_BOOST_CONTEXT
+        XBT_ERROR("  boost: this uses the boost libraries context implementation");
+#else
+        XBT_ERROR("  (boost was disabled at compilation time on this machine -- check configure logs for details. Did you install the libboost-context-dev package?)");
 #endif
         XBT_ERROR("  thread: slow portability layer using system threads (pthreads on UNIX, CreateThread() on windows)");
         xbt_die("Please use a valid factory.");