##
AC_PREREQ(2.59)
-AC_INIT([simgrid],[3.1.1-cvs],[simgrid-devel@lists.gforge.inria.fr])
+AC_INIT([simgrid],[3.2-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
sysconf\
readv\
popen\
- signal])
+ signal\
+ getline])
# check for a working snprintf (or use xbt/snprintf.c, which comes from http://www.ijs.si/software/snprintf/)
AC_FUNC_SNPRINTF
# check for asprintf function familly (or request the replacements from xbt/snprintf.c)
AC_CHECK_FUNC( asprintf, :, AC_DEFINE(NEED_ASPRINTF, 1, enable the asprintf replacement))
AC_CHECK_FUNC( vasprintf, :, AC_DEFINE(NEED_VASPRINTF, 1, enable the vasprintf replacement))
-# we don't use those:
-# A C_CHECK_FUNC( asnprintf, :, A C_DEFINE(NEED_ASNPRINTF, 1, enable the asnprintf replacement))
-# A C_CHECK_FUNC(vasnprintf, :, A C_DEFINE(NEED_VASNPRINTF, 1, enable the vansprintf replacement))
-
# Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
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]].],,
case $with_context in
ucontext) ;;
pthread) ;;
+ pthreads) ;;
windows) ;;
auto) with_context=ucontext;;
*) AC_MSG_ERROR([--with-context must be either ucontext or pthread]) ;;
if test "x$with_context" = "xucontext" ; then
if test ".$mcsc" = .yes; then
AC_MSG_RESULT(found working ucontext. Great!)
- AC_DEFINE([USE_UCONTEXT],1,[Define if we use ucontext or not])
+ AC_DEFINE([CONTEXT_UCONTEXT],1,[Define if xbt contexts are based on ucontext or not])
else
if test ".$windows_context" = .yes ; then
AC_MSG_RESULT(use windows context portability layer.)
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,,
- [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_ERROR([[Cannot find pthreads (try --with-context=ucontext if you haven't already tried).]])])
+ AC_DEFINE([CONTEXT_THREADS],1,[Define if xbt contexts are based on our threads implementation or not])
AC_MSG_RESULT(You have pthreads. Let's use them.)
fi
AC_MSG_RESULT("***** You have decided to use the experimental SimIX. We hope you know what you're doing.. ****")
AC_DEFINE(USE_SIMIX, 1, [Indicates whether we should use SimIX or not])
else
- AC_MSG_RESULT(Eventually you willl come to SimIX: x$enable_simix)
+ AC_MSG_RESULT(Eventually you will come to SimIX: x$enable_simix)
fi
-AM_CONDITIONAL(USE_SIMIX,test x$csdp != xno)
+AM_CONDITIONAL(USE_SIMIX,test x$enable_simix != xno)
#########################################
## Check for libraries extra-dependencies
SG_CONFIGURE_PART(Checking extra libraries dependencies...)
-AC_MSG_CHECKING(for csdp)
SIMGRID_DEP=""
+GRAS_DEP=""
+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
AC_CHECK_LIB(sdp,sdp,csdp=yes, csdp=no,-llapack -lblas -lm)
if test "x$csdp" = xyes; then
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" ;;
+ *mingw* ) GRAS_DEP="$GRAS_DEP -lws2_32" ; SIMGRID_DEP="$SIMGRID_DEP -lws2_32";
+ AC_SUBST(AM_CFLAGS,-DDLL_EXPORT)
+ AC_DEFINE(CONTEXT_THREADS,1);;
esac
if test "x$GRAS_DEP" = x; then
tools/Makefile
tools/gras/Makefile
])
+dnl tools/tesh/Makefile
+
# GRAMINE_CUT_BEGIN