X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/add41f0fa036ece036c3ae31afcb06c29a22908f..1a66f9e48742a7a62c7278c42e3ddd83dfe5180a:/configure.ac diff --git a/configure.ac b/configure.ac index 99579b9af9..6b92886bbf 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-svn],[simgrid-devel@lists.gforge.inria.fr]) +AC_INIT([simgrid],[3.3.3],[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$) +AC_REVISION($Revision: 6267 $) AC_CANONICAL_TARGET AC_LANG([C]) AC_PROG_CXX @@ -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`" @@ -259,6 +259,7 @@ if test xpthread=xyes ; then GRAS_DEP="-lpthread" fi fi +AC_SEARCH_LIBS([connect],[socket],[],[],[]) # need -lsocket on solaris ######################################### ## Build optional modules (gtnets) @@ -296,48 +297,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]) @@ -374,15 +333,29 @@ 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=yes +else + not_maintainer_mode=no +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]) @@ -423,7 +396,7 @@ else AC_PATH_PROG([JAVA], [java] , `which java`) AC_PATH_PROG([JAR], [jar] , `which jar`) AC_CHECK_HEADERS(jni.h) - if test -n "$JAVAC" -a test -n "$JAVA" -a test -n "$JAR" -a test "x$ac_cv_header_jni_h" = "xyes" ; then + if test -n "$JAVAC" && test -n "$JAVA" && test -n "$JAR" && test "x$ac_cv_header_jni_h" = "xyes" ; then use_java="yes" AC_DEFINE(HAVE_JAVA,1, [defines whether Java bindings must be compiled or not]) else @@ -455,15 +428,9 @@ 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 +# 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) # Can we extract really usable backtraces? (also need the popen function) AC_PATH_PROG(ADDR2LINE, addr2line) @@ -516,6 +483,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 @@ -575,12 +543,21 @@ AC_CONFIG_FILES([ examples/gras/mmrpc/Makefile examples/gras/pmm/Makefile examples/gras/all2all/Makefile + examples/gras/replay/Makefile examples/amok/Makefile + examples/smpi/Makefile ]) AC_CONFIG_FILES([ src/smpi/smpicc src/smpi/smpirun +],[ + for file in \ + src/smpi/smpicc \ + src/smpi/smpirun \ + ; do \ + test -e $file && chmod +x $file; \ + done ]) # GRAMINE_CUT_END @@ -601,6 +578,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