X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/85f1cefedf6bbb533b9e3a4beaa18edc4727e8a6..b799df7cc12d5618c96b0b1cb53c348bc810c0a6:/configure.ac diff --git a/configure.ac b/configure.ac index ebc5c2c66a..fccc942d2c 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl GNU LGPL (v2.1) licence. ## AC_PREREQ(2.59) -AC_INIT([simgrid],[3.3.1],[simgrid-devel@lists.gforge.inria.fr]) +AC_INIT([simgrid],[3.3.4-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 @@ -35,7 +35,7 @@ AC_PROG_LIBTOOL ############### ## SVN version check ## -if test -e .svn ; then +if test -e .svn && cat $VERSION | grep -q svn; then VERSION="$VERSION-r`svnversion`" PACKAGE_VERSION="$PACKAGE_VERSION-r`svnversion`" PACKAGE_STRING="PACKAGE_STRING r`svnversion`" @@ -71,9 +71,11 @@ AC_CHECK_FUNCS([gettimeofday usleep \ # check for a working snprintf (or use xbt/snprintf.c, which comes from http://www.ijs.si/software/snprintf/) AC_FUNC_SNPRINTF +# check for a working asprintf (or activate our replacement) +AC_FUNC_ASPRINTF # 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)) +dnl A C_CHECK_FUNC( asprintf, :, AC_DEFINE(NEED_ASPRINTF, 1, enable the asprintf replacement)) +dnl A C_CHECK_FUNC( vasprintf, :, AC_DEFINE(NEED_VASPRINTF, 1, enable the vasprintf replacement)) # Checks for typedefs, structures, and compiler characteristics. AC_C_CONST @@ -297,48 +299,6 @@ AM_CONDITIONAL(HAVE_GTNETS, test "x$gtnets" != "xno") - -######################################### -## Build optional modules (csdp) -## -csdp=no -AC_ARG_WITH(csdp, - AS_HELP_STRING([--with-csdp], [Path to csdp installation (default to empty, i.e. not using csdp)]), - csdp_path="$withval",csdp_path="no") - AC_MSG_CHECKING(for CSDP option:) -if test "x$csdp_path" = "xno" ; then - AC_MSG_RESULT([no, eventually you will come to csdp.]) -else - AC_MSG_RESULT(***** You have decided to use csdp. Let's check whether it works or not *****) - AC_MSG_CHECKING(for csdp) - CSDP_LDFLAGS="-L$csdp_path/lib -lsdp -llapack -lblas -lm" - CSDP_CPPFLAGS="-I$csdp_path/include -I$csdp_path/include/csdp" - - AC_CHECK_LIB(sdp,easy_sdp, csdp_lib=yes, csdp_lib=no,$CSDP_LDFLAGS) - - CPPFLAGS_SAV=$CPPFLAGS - CPPFLAGS+=$CSDP_CPPFLAGS - AC_CHECK_HEADER(declarations.h, csdp_header=yes, csdp_header=no, []) - CPPFLAGS=$CPPFLAGS_SAV - - - - if test "x$csdp_lib = xyes" -a "x$csdp_header = xyes" ; then - csdp=yes; - else - csdp=no; - fi - if test "x$csdp" = xyes; then - AM_CPPFLAGS="$AM_CPPFLAGS $CSDP_CPPFLAGS" - SIMGRID_DEP="$SIMGRID_DEP $CSDP_LDFLAGS" - 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; -fi -AM_CONDITIONAL(HAVE_SDP,test x$csdp != xno) - AC_SUBST([SIMGRID_DEP]) AC_SUBST([SMPI_DEP]) @@ -375,15 +335,30 @@ then fi AM_CONDITIONAL(GRAMINE_MODE,test x$gramine_mode != xno) - 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 + force_compile_warnings=yes fi SG_COMPILE_FLAGS +## +## Support for the supernovae compilation mode +## +if test x$USE_MAINTAINER_MODE = xyes +then + not_maintainer_mode=no +else + not_maintainer_mode=yes +fi + +AC_ARG_ENABLE(supernovae, + AS_HELP_STRING([--enable-supernovae],[Put the whole library in one compilation unit only to help gcc optimizing the code]), + [supernovae=$enableval], + [supernovae=$not_maintainer_mode]) +AM_CONDITIONAL(SUPERNOVAE_MODE, test x$supernovae != xno) + AC_SUBST([CFLAGS]) AC_SUBST([CPPFLAGS]) AC_SUBST([LDFLAGS]) @@ -460,6 +435,32 @@ AM_CONDITIONAL(HAVE_FLEXML,test x$FLEXML != xNOTFOUND) AC_PATH_PROG(DOXYGEN,doxygen,`which doxygen`) AM_CONDITIONAL(HAVE_DOXYGEN,test x$DOXYGEN != x) +# Can we rebuild the publication list from the bib file? +AC_CHECK_PROG(BIBTEX,bibtex,`which flexml`,NOTFOUND) +AC_CHECK_PROG(BIBTOOL,bibtool,`which bibtool`,NOTFOUND) +AC_CHECK_PROG(ICONV,iconv,`which iconv`,NOTFOUND) +AC_CHECK_PROG(BIBTEX2HTML,bibtex2html,`which bibtex2html`,NOTFOUND) + +BIBTEX2HTML_VER="date" +if test "x$BIBTEX2HTML" != "xNOTFOUND" ; then + BIBTEX2HTML_VER=`$BIBTEX2HTML --help 2>&1 | grep date` +fi; + +AC_MSG_CHECKING(whether you have the right bibtex2html and will be able to build HTML files from the bibtex file) +AM_CONDITIONAL(HAVE_BIBTEX2HTML,test "x$BIBTEX2HTML_VER" == "x" && + test "x$BIBTEX2HTML" != "xNOTFOUND" && + test "x$BIBTOOL" != "xNOTFOUND" && + test "x$ICONV" != "xNOTFOUND" ) + +if test "x$BIBTEX2HTML_VER" == "x" && + test "x$BIBTEX2HTML" != "xNOTFOUND" && + test "x$BIBTOOL" != "xNOTFOUND" && + test "x$ICONV" != "xNOTFOUND"; then + AC_MSG_RESULT(yes) +else + AC_MSG_RESULT(no) +fi + # Can we extract really usable backtraces? (also need the popen function) AC_PATH_PROG(ADDR2LINE, addr2line) if test x$ADDR2LINE != x ; then @@ -511,6 +512,7 @@ AC_CONFIG_FILES([ for file in \ tools/graspe-slave tools/graspe-master \ checkall examples/java/runtest \ + src/mk_supernovae.sh \ ; do \ test -e $file && chmod +x $file; \ done @@ -573,6 +575,7 @@ AC_CONFIG_FILES([ examples/amok/Makefile examples/smpi/Makefile ]) +# examples/gras/replay/Makefile AC_CONFIG_FILES([ src/smpi/smpicc @@ -604,6 +607,7 @@ Configuration of package \`${PACKAGE}' (version ${VERSION}) on $gras_arch_name ( Compile Java: ${use_java} Maintainer mode: ${USE_MAINTAINER_MODE} + Supernovae mode: ${supernovae} " if test x$botbuild = xyes ; then