-dnl ####[ Search libs ]#######################################################
-ACI_PACKAGE_SAVED(XML,[XML library (version XML2)],xml2-config,,,:)
-ACI_PACKAGE([SimGrid],[the SimGrid simulator],[SG_init],[-lsimgrid],[simgrid.h],,:)
-AM_CONDITIONAL(HAVE_SG,test x$HAVE_SimGrid = xyes)
+if test "x$with_context" = "xpthread"; then
+ AC_CHECK_HEADERS([pthread.h])
+dnl A C_CHECK_LIB(pthread, pthread_mutex_lock, LIBS="$LIBS -lpthread")
+ AC_CHECK_LIB(pthread,pthread_create,,
+ [AC_MSG_ERROR([[Cannot find pthreads, no way (try --with-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.)
+fi
+
+#########################################
+## Check for libraries extra-dependencies
+##
+
+SG_CONFIGURE_PART(Checking extra libraries dependencies...)
+SIMGRID_DEP=""
+AC_SUBST([SIMGRID_DEP])
+
+GRAS_DEP=""
+AC_CHECK_LIB(nsl, gethostbyname, [GRAS_DEP="$GRAS_DEP -lnsl"])
+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="$GRAS_DEP -lws2_32" ; SIMGRID_DEP="$SIMGRID_DEP -lws2_32" ;;
+esac
+
+if test "x$GRAS_DEP" = x; then
+ AC_MSG_RESULT(none)
+else
+ AC_MSG_RESULT($GRAS_DEP)
+fi
+AC_SUBST([GRAS_DEP])
+
+##############################################
+## Enhance maintainer mode and SUBST variables
+## (must be placed after any compilation tests since our overprotective flags
+## let some tests fail)