X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/30d974c465aad01f80c4d5c41576456717b7c145..dc3c586764381b57c94e902ffc91b4234ddc7599:/configure.ac diff --git a/configure.ac b/configure.ac index 953f769912..52a9d5aa0b 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.2],[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 @@ -66,14 +66,38 @@ AC_CHECK_FUNCS([gettimeofday usleep \ sysconf\ readv\ popen\ - signal\ - getline]) - + 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) +AC_LINK_IFELSE([ + #define _GNU_SOURCE + #include + int main(void){ + FILE * fp; + char * line = NULL; + size_t len = 0; + getline(&line, &len, fp); + } + ],[ + AC_MSG_RESULT(found) + ],[ + AC_SUBST(need_getline, ["#define SIMGRID_NEED_GETLINE 1 /* enable the getline replacement*/"]) + AC_DEFINE(SIMGRID_NEED_GETLINE, 1, enable the getline replacement) + AC_MSG_RESULT(not found (activating internal implementation)) + ]) + # 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)) +AC_CHECK_FUNC( asprintf, :,[ + AC_DEFINE(NEED_ASPRINTF, 1, enable the asprintf replacement) + AC_SUBST(need_asprintf, ["#define SIMGRID_NEED_ASPRINTF 1 /* enable the asprintf replacement */"]) + ]) +AC_CHECK_FUNC( vasprintf, :,[ + AC_DEFINE(NEED_VASPRINTF, 1, enable the vasprintf replacement) + AC_SUBST(need_vasprintf, ["#define SIMGRID_NEED_VASPRINTF 1 /*enable the vasprintf replacement */"]) + ]) # Checks for typedefs, structures, and compiler characteristics. AC_C_CONST @@ -333,7 +357,6 @@ then fi AM_CONDITIONAL(GRAMINE_MODE,test x$gramine_mode != xno) - AM_MAINTAINER_MODE if test x$USE_MAINTAINER_MODE = xyes then @@ -342,6 +365,15 @@ then fi SG_COMPILE_FLAGS +## +## Support for the supernovae compilation mode +## +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=no]) +AM_CONDITIONAL(SUPERNOVAE_MODE, test x$supernovae != xno) + AC_SUBST([CFLAGS]) AC_SUBST([CPPFLAGS]) AC_SUBST([LDFLAGS]) @@ -418,6 +450,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 @@ -447,6 +505,7 @@ SG_CONFIGURE_PART(Generating files...) AC_CONFIG_FILES([ Makefile include/Makefile + include/simgrid_config.h src/Makefile src/context_sysv_config.h ]) @@ -469,6 +528,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 @@ -531,6 +591,7 @@ AC_CONFIG_FILES([ examples/amok/Makefile examples/smpi/Makefile ]) +# examples/gras/replay/Makefile AC_CONFIG_FILES([ src/smpi/smpicc @@ -562,6 +623,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