X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d491b750bb78240bbcddaf153ef8948893ba9d83..54a9c094f7fd3127fb70942225850317fe33996d:/configure.ac diff --git a/configure.ac b/configure.ac index a773d19bf7..08611ed371 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ ## AC_PREREQ(2.59) -AC_INIT([simgrid],[2.96-cvs],[simgrid-devel@lists.gforge.inria.fr]) +AC_INIT([simgrid],[3.1.1-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 @@ -26,6 +26,7 @@ AC_PROG_CC(xlC gcc cc) AM_SANITY_CHECK AC_PROG_MAKE_SET AC_CHECK_PRINTF_NULL +AC_CHECK_VA_COPY # Checks for header files. AC_HEADER_STDC @@ -34,17 +35,22 @@ AC_CHECK_HEADERS([sys/socket.h \ sys/stat.h \ windows.h winsock.h winsock2.h \ sys/time.h \ - errno.h unistd.h ]) + errno.h unistd.h \ + execinfo.h\ + signal.h ]) AC_CHECK_FUNCS([gettimeofday usleep \ getdtablesize \ - sysconf]) + sysconf\ + readv\ + popen\ + signal]) # 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( vasprintf, :, A C_DEFINE(NEED_VASPRINTF, 1, enable the vasprintf replacement)) # 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)) @@ -108,6 +114,9 @@ dnl # 3. allow decision to be overridden by user 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(context, [ --with-context=[ucontext/pthread] Use either (System V) swapcontext or pthread [[default=auto]].],, with_context=auto) @@ -192,13 +201,17 @@ AM_MAINTAINER_MODE if test x$USE_MAINTAINER_MODE = xyes then # Maintainers have no choice ! I'm a BOFH, and I plainly assume. [Mt] - enable_compile_warnings=yes + enable_compile_warnings=yes fi SG_COMPILE_FLAGS AC_SUBST(CFLAGS) AC_SUBST(CPPFLAGS) AC_SUBST(LDFLAGS) +AC_SUBST([abs_builddir]) +AC_SUBST([abs_srcdir]) +AC_SUBST([abs_top_builddir]) +AC_SUBST([abs_top_srcdir]) ##################### ## Check for programs @@ -220,12 +233,28 @@ AC_PROG_FLEX(2.5.30) AC_CHECK_PROG(FLEXML,flexml,`which flexml`,NOTFOUND) AM_CONDITIONAL(HAVE_FLEXML,test x$FLEXML != xNOTFOUND) +if test x$USE_MAINTAINER_MODE = xyes +then + # Check for doxygen when in maintainer mode since dist* targets fail + # without it + AC_PATH_PROG(DOXYGEN,doxygen,`which doxygen`) + if test x$DOXYGEN = x ; then + AC_MSG_ERROR([doxygen is mandatory in maintainer mode]) + fi +fi + +# Can we extract really usable backtraces? (also need the popen function) +AC_PATH_PROG(ADDR2LINE, addr2line) +if test x$ADDR2LINE != x ; then + AC_DEFINE_UNQUOTED(ADDR2LINE,"$ADDR2LINE",[Path to the addr2line tool]) +fi + ################### ## Makes the output ## -# examples/pastry/Makefile examples/pastry/test_sg +# # examples/gras/chord/Makefile examples/gras/chord/test_sg examples/gras/chord/test_rl # src/amok/Makefile @@ -237,13 +266,24 @@ AC_CONFIG_FILES([ src/ucontext_stack.h examples/Makefile examples/msg/Makefile examples/msg/run_msg_test + 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/timer/Makefile examples/gras/timer/test_sg examples/gras/timer/test_rl + 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/tokenS/Makefile examples/gras/tokenS/test_sg examples/gras/tokenS/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/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 @@ -258,12 +298,20 @@ AC_CONFIG_FILES([ 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 \ \ 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/tokenS/test_sg examples/gras/tokenS/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 \ test -e $file && chmod +x $file; \ done @@ -289,9 +337,19 @@ Configuration of package \`${PACKAGE}' (version ${VERSION}) on $gras_arch_name ( Compiler: ${CC} (version: ${GCC_VERSION}) CFlags: ${CFLAGS} + CPPFlags: ${CPPFLAGS} LDFlags: ${LDFLAGS} Context backend: ${with_context} " +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:" + echo "WARNING: ./configure --enable-maintainer-mode $ac_configure_args" + echo "WARNING:" +fi + exit 0;