X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9612c0760b0042c358072ca2d31eb17eb1cc60f3..ecb6ebd6cc772d1c45baedd0fd0dfc1c750af21a:/configure.ac diff --git a/configure.ac b/configure.ac index 908737e468..fc35adfdf3 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,7 +44,8 @@ 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 @@ -110,6 +111,7 @@ 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]].],, @@ -122,6 +124,7 @@ fi case $with_context in ucontext) ;; pthread) ;; + pthreads) ;; windows) ;; auto) with_context=ucontext;; *) AC_MSG_ERROR([--with-context must be either ucontext or pthread]) ;; @@ -130,7 +133,7 @@ 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.) @@ -142,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 (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 @@ -176,10 +182,10 @@ 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_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) @@ -191,7 +197,38 @@ SG_CONFIGURE_PART(Checking extra libraries dependencies...) SIMGRID_DEP="" GRAS_DEP="" -AC_CHECK_LIB(pthread,pthread_create,SIMGRID_DEP="-lpthread"; GRAS_DEP="-lpthread") + +######################################### +## 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]) + SIMGRID_DEP="$SIMGRID_DEP $GTNETS_LDFLAGS -lgtnets" +fi +AM_CONDITIONAL(USE_GTNETS,test "x$gtnets_path" != xNO) + +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 @@ -213,7 +250,8 @@ 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"; - 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 @@ -328,8 +366,10 @@ AC_CONFIG_FILES([ AC_CONFIG_FILES([ tools/Makefile tools/gras/Makefile + tools/tesh/Makefile ]) + # GRAMINE_CUT_BEGIN # Tools NOT being embeeded in gramine @@ -366,23 +406,26 @@ AC_CONFIG_FILES([ # Examples +# examples/gras/p2p/Makefile +# examples/gras/p2p/chord/Makefile +# examples/gras/p2p/can/Makefile + 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 - examples/gras/rpc/Makefile examples/gras/rpc/test_sg examples/gras/rpc/test_rl - examples/gras/timer/Makefile examples/gras/timer/test_sg examples/gras/timer/test_rl - examples/gras/chrono/Makefile examples/gras/chrono/test_sg examples/gras/chrono/test_rl - examples/gras/mutual_exclusion/simple_token/Makefile examples/gras/mutual_exclusion/simple_token/test_sg examples/gras/mutual_exclusion/simple_token/test_rl - examples/gras/mmrpc/Makefile examples/gras/mmrpc/test_sg examples/gras/mmrpc/test_rl - examples/gras/pmm/Makefile examples/gras/pmm/test_sg examples/gras/pmm/test_rl - examples/gras/all2all/Makefile examples/gras/all2all/test_sg examples/gras/all2all/test_rl - - examples/gras/p2p/Makefile - examples/gras/p2p/chord/Makefile examples/gras/p2p/chord/test_sg examples/gras/p2p/chord/test_rl - examples/gras/p2p/can/Makefile examples/gras/p2p/can/test_sg examples/gras/p2p/can/test_rl + examples/gras/Makefile + examples/gras/ping/Makefile + examples/gras/rpc/Makefile + examples/gras/timer/Makefile + examples/gras/chrono/Makefile + examples/gras/mutual_exclusion/simple_token/Makefile + examples/gras/mmrpc/Makefile + examples/gras/pmm/Makefile + examples/gras/all2all/Makefile + examples/amok/Makefile examples/amok/bandwidth/Makefile examples/amok/bandwidth/test_sg examples/amok/bandwidth/test_rl @@ -390,19 +433,6 @@ AC_CONFIG_FILES([ ],[ for file in \ \ - examples/amok/bandwidth/test_sg examples/amok/bandwidth/test_rl \ - examples/amok/saturate/test_sg examples/amok/saturate/test_rl \ - \ - examples/gras/ping/test_sg examples/gras/ping/test_rl \ - examples/gras/rpc/test_sg examples/gras/rpc/test_rl \ - examples/gras/timer/test_sg examples/gras/timer/test_rl \ - examples/gras/chrono/test_sg examples/gras/chrono/test_rl \ - examples/gras/mutual_exclusion/simple_token/test_sg examples/gras/mutual_exclusion/simple_token/test_rl \ - examples/gras/mmrpc/test_sg examples/gras/mmrpc/test_rl \ - examples/gras/pmm/test_sg examples/gras/pmm/test_rl \ - examples/gras/all2all/test_sg examples/gras/all2all/test_rl \ - examples/gras/p2p/chord/test_sg examples/gras/p2p/chord/test_rl \ - examples/gras/p2p/can/test_sg examples/gras/p2p/can/test_rl \ examples/msg/run_msg_test \ examples/simdag/test_simdag \ ; do \ @@ -410,14 +440,6 @@ AC_CONFIG_FILES([ done ]) -# examples/gras/chord/test_sg examples/gras/chord/test_rl \ -# examples/gras/pastry/test_sg - - - -# examples/gras/saturate/Makefile examples/gras/saturate/test_sg -# examples/gras/alnem/Makefile examples/gras/alnem/test_sg - # GRAMINE_CUT_END @@ -439,9 +461,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: 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