X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ccde0c6c098524ebb532315f846bc0953c7c1e62..86df528d03ff316ae1576a4d85cc19efa4503892:/configure.ac diff --git a/configure.ac b/configure.ac index 35410a2552..a46b6b86fc 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ ## AC_PREREQ(2.59) -AC_INIT([simgrid],[3.1.1-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 @@ -44,17 +44,14 @@ AC_CHECK_FUNCS([gettimeofday usleep \ 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 @@ -83,10 +80,7 @@ dnl # 1. determine possibilities dnl # dnl # check for MCSC method -AC_MSG_CHECKING(on top of what can we build the contexts) -AC_CHECK_HEADER(ucontext.h,,, [#include ]) -AC_CHECK_FUNCS(makecontext swapcontext getcontext setcontext) -AC_CHECK_MCSC(mcsc=yes, mcsc=no) +AC_CHECK_MCSC(mcsc=yes, mcsc=no) dnl # check for pthread method AC_CHECK_HEADERS([pthread.h]) @@ -117,22 +111,29 @@ 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]].],, with_context=auto) + +if test "x$with_context$mcsc" = "xucontextno" ; then + AC_MSG_ERROR([--with-context=ucontext specified but ucontext unusable. Relaunch configure without this argument.], 77) +fi + case $with_context in ucontext) ;; pthread) ;; + pthreads) ;; windows) ;; auto) with_context=ucontext;; - *) AC_MSG_ERROR("--with-context must be either ucontext or pthread") ;; + *) AC_MSG_ERROR([--with-context must be either ucontext or pthread]) ;; esac 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.) @@ -144,11 +145,14 @@ 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,, - [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 @@ -169,21 +173,83 @@ dnl # direction of stack grow AC_CHECK_STACKSETUP(makecontext, pth_skaddr_makecontext, pth_sksize_makecontext) fi + +######################################### +## Build optional modules (simix) +## +SG_CONFIGURE_PART(Optional modules) +AC_ARG_ENABLE(simix, + 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_DEFINE(USE_SIMIX, 1, [Indicates whether we should use SimIX or not]) +else + 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 ## SG_CONFIGURE_PART(Checking extra libraries dependencies...) + 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 + SIMGRID_DEP="$SIMGRID_DEP -lsdp -llapack -lblas -lm" + AC_MSG_RESULT(Found working sdp library.) + AC_DEFINE(HAVE_SDP, 1, [Indicates whether we have the CSDP library or not]) +else + AC_MSG_RESULT(Could not find any working sdp library.) +fi; +AM_CONDITIONAL(HAVE_SDP,test x$csdp != xno) + 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 @@ -193,6 +259,7 @@ else fi AC_SUBST([GRAS_DEP]) + ############################################## ## Enhance maintainer mode and SUBST variables ## (must be placed after any compilation tests since our overprotective flags @@ -293,8 +360,27 @@ AC_CONFIG_FILES([ src/ucontext_stack.h ]) +# Tools being embeeded in gramine (stub generator) +AC_CONFIG_FILES([ + tools/Makefile + tools/gras/Makefile + tools/tesh/Makefile +]) + + # GRAMINE_CUT_BEGIN +# Tools NOT being embeeded in gramine +AC_CONFIG_FILES([ + tools/graspe-slave +],[ + for file in \ + tools/graspe-slave tools/graspe-master \ + ; do \ + test -e $file && chmod +x $file; \ + done +]) + # Testsuite AC_CONFIG_FILES([ @@ -310,11 +396,19 @@ AC_CONFIG_FILES([ done ]) -# Examples, documentation and tools +# Documentation +AC_CONFIG_FILES([ + doc/Makefile + doc/Doxyfile +]) + +# Examples 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 @@ -333,13 +427,8 @@ AC_CONFIG_FILES([ examples/amok/Makefile examples/amok/bandwidth/Makefile examples/amok/bandwidth/test_sg examples/amok/bandwidth/test_rl examples/amok/saturate/Makefile examples/amok/saturate/test_sg examples/amok/saturate/test_rl - doc/Makefile - doc/Doxyfile - tools/graspe-slave tools/Makefile - tools/gras/Makefile ],[ for file in \ - tools/graspe-slave tools/graspe-master \ \ examples/amok/bandwidth/test_sg examples/amok/bandwidth/test_rl \ examples/amok/saturate/test_sg examples/amok/saturate/test_rl \ @@ -361,7 +450,6 @@ AC_CONFIG_FILES([ done ]) - # examples/gras/chord/test_sg examples/gras/chord/test_rl \ # examples/gras/pastry/test_sg @@ -391,9 +479,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: This is not really supported, so you should configure SimGrid like:" + 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