##
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
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 (try --with-context=ucontext if you haven't already tried).]])])
- AC_DEFINE([USE_PTHREADS],1,[Define if we use pthreads or not])
+ 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
AS_HELP_STRING([--enable-simix], [Use the new SimIX module (default=no)]),
enable_simix=$enableval,enable_simix=no)
if test "x$enable_simix" = "xyes" ; then
- AC_MSG_RESULT("***** You have decided to use the experimental SimIX. We hope you know what you're doing.. ****")
+ 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 will come to SimIX: x$enable_simix)
+ AC_MSG_RESULT(Eventually you will come to SimIX.)
fi
AM_CONDITIONAL(USE_SIMIX,test x$enable_simix != xno)
+#########################################
+## Build optional modules (gtnets)
+##
+AC_ARG_WITH(gtnets,
+ AS_HELP_STRING([--with-gtnets], [Path to GTNetS installation (default to empty, ie not using GTNetS)]),
+ gtnets_path="$withval",gtnets_path="NO")
+if test "x$gtnets_path" = "xNO" ; then
+ AC_MSG_RESULT(Eventually you will come to GTNetS.)
+else
+ AC_MSG_RESULT(***** You have decided to use the experimental GTNetS. We hope you know what you're doing.. ****)
+ AC_DEFINE(USE_GTNETS, 1, [Indicates whether we should use GTNetS or not])
+ if ! test -e $gtnets_path ; then
+ AC_MSG_ERROR(Provided path to GTNetS include files ($gtnets_path) do not exist!)
+ fi
+ GTNETS_CFLAGS=-I$gtnets_path/include
+ AC_SUBST([GTNETS_CFLAGS])
+ GTNETS_LDFLAGS=-L$gtnets_path/lib
+ AC_SUBST([GTNETS_LDFLAGS])
+fi
+AM_CONDITIONAL(USE_GTNETS,test "x$gtnets_path" != xNO)
+
#########################################
## Check for libraries extra-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
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";
- AC_SUBST(AM_CFLAGS,-DDLL_EXPORT);;
+ AC_SUBST(AM_CFLAGS,-DDLL_EXPORT)
+ AC_DEFINE(CONTEXT_THREADS,1);;
esac
if test "x$GRAS_DEP" = x; then
AC_CONFIG_FILES([
tools/Makefile
tools/gras/Makefile
+ tools/tesh/Makefile
])
-dnl tools/tesh/Makefile
# GRAMINE_CUT_BEGIN
AC_CONFIG_FILES([
examples/Makefile
- examples/msg/Makefile examples/msg/run_msg_test
+ examples/msg/Makefile
+ examples/msg/basic.tesh examples/msg/small_plat.tesh
+ examples/msg/suspend.tesh examples/msg/flexml_bypass.tesh
examples/simdag/Makefile examples/simdag/test_simdag
examples/gras/Makefile
examples/gras/ping/Makefile examples/gras/ping/test_sg examples/gras/ping/test_rl
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
