X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8267a61f91f5ed9e7368d3059e9d53b96cc8fcb7..ff1d0c3097e0e9f7f35cec9de334417c747a8e34:/configure.ac

diff --git a/configure.ac b/configure.ac
index 9241aefe0b..831dc0f8e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 ##
 
 AC_PREREQ(2.59)
-AC_INIT([simgrid],[3.2-cvs],[simgrid-devel@lists.gforge.inria.fr])
+AC_INIT([simgrid],[3.3-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
@@ -111,6 +111,7 @@ dnl #
 AC_MSG_CHECKING(what kind of backend should we use)
 
 AC_ARG_WITH(pthread, [  --with-pthread   Use pthread instead of ucontext.],with_context=pthread)
+AC_ARG_WITH(pthread, [  --with-pthreads   Use pthread instead of ucontext.],with_context=pthread)
 
 AC_ARG_WITH(context,
   [  --with-context=[ucontext/pthread]   Use either (System V) swapcontext or pthread [[default=auto]].],,
@@ -123,6 +124,7 @@ fi
 case $with_context in
  ucontext) ;;
  pthread) ;;
+ pthreads) ;;
  windows) ;;
  auto) with_context=ucontext;;
  *) AC_MSG_ERROR([--with-context must be either ucontext or pthread]) ;;
@@ -143,6 +145,9 @@ if test "x$with_context" = "xucontext" ; then
   fi
 fi
 
+if test "x$with_context" = "xpthreads"; then
+  with_context=pthread
+fi
 if test "x$with_context" = "xpthread"; then
   AC_CHECK_HEADERS([pthread.h])
   AC_CHECK_LIB(pthread,pthread_create,,
@@ -192,7 +197,15 @@ SG_CONFIGURE_PART(Checking extra libraries dependencies...)
 
 SIMGRID_DEP=""
 GRAS_DEP=""
-AC_CHECK_LIB(pthread,pthread_create,SIMGRID_DEP="-lpthread"; GRAS_DEP="-lpthread")
+if test xpthread=xyes ; then 
+  # if the pthreads are usable
+  if test "x$with_context" = "xpthread" ; then
+    # if we use them to implement the xbt_context
+    SIMGRID_DEP="-lpthread"
+  fi
+  # we need them in any case for the gras lib (which is multithreaded)
+  GRAS_DEP="-lpthread"
+fi
 
 AC_MSG_CHECKING(for csdp)
 sdp=no
@@ -330,8 +343,8 @@ AC_CONFIG_FILES([
 AC_CONFIG_FILES([
   tools/Makefile
     tools/gras/Makefile
+    tools/tesh/Makefile
 ])
-dnl tools/tesh/Makefile
 
 
 # GRAMINE_CUT_BEGIN
@@ -372,7 +385,7 @@ AC_CONFIG_FILES([
 
 AC_CONFIG_FILES([
   examples/Makefile 
-    examples/msg/Makefile           examples/msg/run_msg_test
+    examples/msg/Makefile
     examples/simdag/Makefile	    examples/simdag/test_simdag
     examples/gras/Makefile 
       examples/gras/ping/Makefile   examples/gras/ping/test_sg   examples/gras/ping/test_rl
@@ -443,9 +456,10 @@ Configuration of package \`${PACKAGE}' (version ${VERSION}) on $gras_arch_name (
 if test -e CVS && test x$USE_MAINTAINER_MODE != xyes ; then
   echo "WARNING:"
   echo "WARNING: you seem to compile the CVS version without the maintainer mode."
-  echo "WARNING: You may want to enable this by specifying:"
+  echo "WARNING: You won't be able to build archives that way (make dist is likely to fail). "
+  echo "WARNING: If you want to enable the maintainer mode, juste specify it like this:"
   echo "WARNING:"
-  echo "WARNING: ./configure --enable-maintainer-mode  $ac_configure_args"
+  echo "WARNING: ./configure '--enable-maintainer-mode' $ac_configure_args"
   echo "WARNING:"
 fi
 echo $build_id > stamp.configure