X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fd2f82a8fe8350e92ffe68306cf4a9468c17e3f5..70fe1bef83c75e436e2085c8cbb32ee401a1e273:/configure.ac diff --git a/configure.ac b/configure.ac index 85e5dc35bd..3abcab9a6f 100644 --- a/configure.ac +++ b/configure.ac @@ -9,14 +9,15 @@ 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.2-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$) +AC_REVISION($Revision: 6267 $) AC_CANONICAL_TARGET AC_LANG([C]) +AC_PROG_CXX AM_PROG_GCJ AM_INIT_AUTOMAKE([gnu -Wno-portability]) @@ -34,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`" @@ -94,7 +95,7 @@ dnl ## dnl ## CONTEXT IMPLEMENTATION dnl ## -SG_CONFIGURE_PART([Checking for threads, contexts or assimilated...]) +SG_CONFIGURE_PART([Checking threads, contexts or assimilated...]) dnl # dnl # 1. determine possibilities @@ -199,6 +200,7 @@ if test "x$with_context" = "xucontext" ; then if test ".$mcsc" = .yes; then AC_MSG_RESULT(found working ucontext. Great!) AC_DEFINE([CONTEXT_UCONTEXT],1,[Define if xbt contexts are based on ucontext or not]) + AC_CHECK_HEADERS([valgrind/valgrind.h]) else if test ".$windows_context" = .yes ; then AC_MSG_RESULT(use windows context portability layer.) @@ -257,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) @@ -270,8 +273,6 @@ if test "x$gtnets_path" = "xno" ; then else AC_MSG_RESULT(***** You have decided to use the experimental GTNetS. We hope you know what you're doing.. *****) AC_MSG_CHECKING(for gtnets) - AC_DEFINE([HAVE_GTNETS], 1, [Indicates that we have GTNETS support]) - AM_CONDITIONAL(HAVE_GTNETS, test "x$gtnets" != "xno") AC_LANG_PUSH([C++]) GTNETS_LDFLAGS="-lgtnets -L$gtnets_path/lib" GTNETS_CPPFLAGS="-I$gtnets_path/include -I$gtnets_path/include/gtnets" @@ -288,10 +289,11 @@ fi if test "x$gtnets" = "xyes" ; then AC_MSG_RESULT(Enabling GTNETS support.) + AC_DEFINE([HAVE_GTNETS], 1, [Indicates that we have GTNETS support]) LDFLAGS+="-lgtnets -L$gtnets_path/lib" - CPPFLAGS+="-I$gtnets_path/include -I$gtnets_path/include/gtnets -DHAVE_GTNETS" + CPPFLAGS+="-I$gtnets_path/include -I$gtnets_path/include/gtnets" fi - +AM_CONDITIONAL(HAVE_GTNETS, test "x$gtnets" != "xno") @@ -305,7 +307,7 @@ AC_ARG_WITH(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.) + 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) @@ -327,7 +329,7 @@ else csdp=no; fi if test "x$csdp" = xyes; then - AM_CPPFLAGS="$AM_CPPFLAGS $CSDP_CPPFLAGS -DHAVE_SDP" + 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]) @@ -378,7 +380,7 @@ 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 @@ -410,7 +412,7 @@ if test -e .svn && test x$USE_MAINTAINER_MODE != xyes && test x$botbuild != xyes fi -SG_CONFIGURE_PART(Check for Java bindings...) +SG_CONFIGURE_PART(Checking Java bindings...) # Java cruft AC_ARG_ENABLE(java, AS_HELP_STRING([--disable-java], [To not compile the Java bindings even if the tools are found]), @@ -422,11 +424,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" \ - && test -n "$JAVA" \ - && test -n "$JAR" \ - && 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 @@ -441,7 +439,7 @@ AM_CONDITIONAL(HAVE_JAVA,test "x$use_java" = "xyes") ## Check for programs ## -SG_CONFIGURE_PART(Check for programs...) +SG_CONFIGURE_PART(Checking programs...) AC_CHECK_PROG(BASH, bash, `which bash`, /bin/sh) WARNING="This file is generated, do not edit" AC_SUBST(WARNING) @@ -458,15 +456,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) @@ -507,6 +499,7 @@ AC_CONFIG_FILES([ tools/gras/Makefile tools/tesh/Makefile ]) +# tools/tesh2/Makefile # GRAMINE_CUT_BEGIN @@ -578,11 +571,19 @@ AC_CONFIG_FILES([ examples/gras/pmm/Makefile examples/gras/all2all/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