X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2b6d43fe1fac3d1a12a5427e0c074fa0454c52e2..8194d07f735bc6c047a70525ebda6de6309c2493:/configure.ac

diff --git a/configure.ac b/configure.ac
index ae7a8e04f6..6264ab1c59 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.92],[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])
 
@@ -41,15 +41,46 @@ GRAS_CHECK_STRUCT_COMPACTION
 # Checks for header files.
 AC_HEADER_STDC
 AC_HEADER_TIME
-AC_CHECK_HEADERS([sys/socket.h winsock.h winsock2.h \
+AC_CHECK_HEADERS([sys/socket.h \
                   sys/stat.h \
-		  ucontext.h \
+		  windows.h winsock.h winsock2.h \
 		  sys/time.h \
 		  errno.h unistd.h ])
 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=pthread)
+AC_MSG_CHECKING(on top of what can we build the contexts)
+if test "x$enable_context" = "xucontext"; then
+  AC_CHECK_HEADERS([ucontext.h])
+  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_HEADERS([pthread.h])
+  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
@@ -77,7 +108,7 @@ AC_CHECK_LIB(socket, connect,    [GRAS_DEP="$GRAS_DEP -lsocket"])
 
 AC_MSG_CHECKING(for extra dependencies of libgras)
 case $host_os in
-  *mingw* ) GRAS_DEP=-lws2_32;;
+  *mingw* ) GRAS_DEP="$GRAS_DEP -lws2_32" ; SIMGRID_DEP="$SIMGRID_DEP -lws2_32" ;;
 esac
 	   
 if test "x$GRAS_DEP" = x; then