X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2bdc3ca9addaae9c9d348d3cc8171f2d4694a1d0..c065f0f21ab43fa2749e992b3e14a68f88f8ffb1:/configure.ac diff --git a/configure.ac b/configure.ac index a3b0022d17..b0528a236f 100644 --- a/configure.ac +++ b/configure.ac @@ -9,12 +9,12 @@ dnl GNU LGPL (v2.1) licence. ## AC_PREREQ(2.59) -AC_INIT([simgrid],[3.3.4],[simgrid-devel@lists.gforge.inria.fr]) +AC_INIT([simgrid],[3.3.5-svn],[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_REVISION($Revision: 6267 $) +AC_REVISION($Revision: 6998 $) AC_CANONICAL_TARGET AC_LANG([C]) AC_PROG_CXX @@ -32,6 +32,11 @@ dnl We do build a proper DLL when using win32 AC_LIBTOOL_WIN32_DLL AC_PROG_LIBTOOL +SIMGRID_DEP="" +SMPI_DEP="" +GRAS_DEP="" + + ############### ## SVN version check ## @@ -71,7 +76,7 @@ AC_CHECK_FUNCS([gettimeofday usleep \ sysconf\ readv\ popen\ - signal]) + signal]) dnl GNU systems before POSIX2008 need the _GNU_SOURCE definition to find getline (and simgrid does pass this) AC_MSG_CHECKING(a usable getline) @@ -91,7 +96,14 @@ AC_LINK_IFELSE([ AC_DEFINE(SIMGRID_NEED_GETLINE, 1, enable the getline replacement) AC_MSG_RESULT(not found (activating internal implementation)) ]) - + +dnl AC_MSG_CHECKING(POSIX timer functions) +AC_CHECK_LIB(rt, [clock_gettime], [ + AC_DEFINE(HAVE_POSIX_GETTIME, 1, POSIX timer functions were found) + SIMGRID_DEP="$SIMGRID_DEP -lrt" + GRAS_DEP="$GRAS_DEP -lrt" + ]) + # 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) @@ -273,19 +285,15 @@ fi SG_CONFIGURE_PART(Checking extra libraries dependencies...) -SIMGRID_DEP="" -SMPI_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" + SIMGRID_DEP="$SIMGRID_DEP -lpthread" fi # we need them in any case for the gras lib (which is multithreaded), but on windows (of course) if test "x$with_context" != "xwindows" ; then - GRAS_DEP="-lpthread" + GRAS_DEP="$GRAS_DEP -lpthread" fi fi AC_SEARCH_LIBS([connect],[socket],[],[],[]) # need -lsocket on solaris @@ -370,6 +378,18 @@ then fi SG_COMPILE_FLAGS +## +## Support for tracing instrumentation +## +AC_CONFIG_HEADERS([include/instr/config.h]) +AC_ARG_ENABLE(tracing, + AS_HELP_STRING([--enable-tracing],[Activate the instrumentation so SimGrid can be traced to be visualized]), + [tracing=$enableval], + [tracing=no]) +if test x$tracing = xyes ; then + AC_DEFINE([HAVE_TRACING],[1], [defines whether instrumentation must be compiled or not]) +fi + ## ## Support for the supernovae compilation mode ## @@ -423,13 +443,62 @@ else use_java="yes" AC_DEFINE(HAVE_JAVA,1, [defines whether Java bindings must be compiled or not]) else - use_java="no" + use_java="no (you may want to install the java-gcj-compat-dev package)" fi fi AC_MSG_RESULT(decide whether to compile java bindings... $use_java) AM_CONDITIONAL(HAVE_JAVA,test "x$use_java" = "xyes") +SG_CONFIGURE_PART(Checking Lua bindings...) +AC_ARG_ENABLE(lua, + AS_HELP_STRING([--disable-lua], [To not compile the Lua bindings even if the tools are found]), + disable_lua=$enableval,disable_lua=yes) +if test "x$disable_lua" != "xyes" ; then + use_lua="disabled by user" +else + AC_CHECK_HEADERS(lua5.1/lualib.h) + if test "x$ac_cv_header_lua5_1_lualib_h" = "xyes" ; then + use_lua="yes" + AC_DEFINE(HAVE_LUA,1, [defines whether Lua bindings must be compiled or not]) + SIMGRID_DEP="${SIMGRID_DEP} -ldl -llua5.1" + else + use_lua="no (you may want to install the liblua5.1-0-dev package)" + fi +fi +AC_MSG_RESULT(decide whether to compile lua bindings... $use_lua) +AM_CONDITIONAL(HAVE_LUA,test "x$use_lua" = "xyes") + +SG_CONFIGURE_PART(Checking Ruby bindings...) +# Ruby cruft +AC_ARG_ENABLE(ruby, + AS_HELP_STRING([--disable-ruby], [To not compile the Ruby bindings even if the tools are found]), + disable_ruby=$enableval,disable_ruby=yes) +if test "x$disable_ruby" != "xyes" ; then + use_ruby="disabled by user" +else + CPPFLAGS="-I/usr/lib/ruby/1.8/i486-linux/ $CPPFLAGS" + AC_MSG_CHECKING(checking ruby.h usability and presence) + AC_COMPILE_IFELSE([ + #undef PACKAGE_NAME + #undef PACKAGE_TARNAME + #undef PACKAGE_VERSION + #undef PACKAGE_STRING + #undef PACKAGE_BUGREPORT + #include + ], use_ruby=yes,use_ruby="no (Package ruby1.8-dev missing)") + AC_MSG_RESULT($use_ruby) + if test "x$use_ruby" = "xyes" ; then + AC_DEFINE(HAVE_RUBY,1, [defines whether Ruby bindings must be compiled or not]) + SIMGRID_DEP="${SIMGRID_DEP} -lruby1.8" + else + AC_MSG_RESULT(Please install the ruby1.8-dev package (on debian and similar) to get ruby bindings) + fi +fi +AC_MSG_RESULT(decide whether to compile ruby bindings... $use_ruby) +AM_CONDITIONAL(HAVE_RUBY,test "x$use_ruby" = "xyes") + + ##################### ## Check for programs ## @@ -453,7 +522,9 @@ AM_CONDITIONAL(HAVE_FLEXML,test x$FLEXML != xNOTFOUND) # Check for doxygen when in maintainer mode which is helpful to build doc & dist AC_PATH_PROG(DOXYGEN,doxygen,`which doxygen`) -AM_CONDITIONAL(HAVE_DOXYGEN,test x$DOXYGEN != x) +AC_PATH_PROG(FIG2DEV,fig2dev,`which fig2dev`) +AM_CONDITIONAL(HAVE_DOXYGEN,test x$DOXYGEN != x && + test x$FIG2DEV != x) # Can we rebuild the publication list from the bib file? AC_CHECK_PROG(BIBTEX,bibtex,`which flexml`,NOTFOUND) @@ -627,6 +698,8 @@ Configuration of package \`${PACKAGE}' (version ${VERSION}) on $gras_arch_name ( Context backend: ${with_context} Compile Java: ${use_java} + Compile Lua: ${use_lua} + Compile Ruby: ${use_ruby} Maintainer mode: ${USE_MAINTAINER_MODE} Supernovae mode: ${supernovae}