X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d604aa6bc284f5e8c8e7d4216afea6fe43ba7564..70fe1bef83c75e436e2085c8cbb32ee401a1e273:/configure.ac diff --git a/configure.ac b/configure.ac index 0f22453bcf..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) @@ -282,17 +285,18 @@ else CPPFLAGS=$CPPFLAGS_SAV LDFLAGS=$LDFLAGS_SAV AC_LANG_POP([C++]) +fi - if test "x$gtnets" = xyes ; then - AM_CPPFLAGS="$AM_CPPFLAGS $GTNETS_CPPFLAGS" - SIMGRID_DEP="$SIMGRID_DEP $GTNETS_LDFLAGS" - AC_MSG_RESULT(Found working gtnets library.) - AC_DEFINE(HAVE_GTNETS, 1, [Indicates whether we have the GTNETS library or not]) - else - AC_MSG_RESULT(Could not find any working gtnets library or not patched version, see config.log for details .) - 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" fi -AM_CONDITIONAL(HAVE_GTNETS,test "x$gtnets" != xno) +AM_CONDITIONAL(HAVE_GTNETS, test "x$gtnets" != "xno") + + + ######################################### ## Build optional modules (csdp) @@ -301,8 +305,9 @@ 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(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 +332,7 @@ else 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]) + 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; @@ -375,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 @@ -407,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]), @@ -419,12 +424,9 @@ 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 use_java="no" fi @@ -432,11 +434,12 @@ fi AC_MSG_RESULT(decide whether to compile java bindings... $use_java) 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) @@ -453,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) @@ -470,15 +467,10 @@ if test x$ADDR2LINE != x ; then fi AC_SUBST(ac_configure_args) +AC_DEFINE_UNQUOTED(AC_CONFIGURE_ARGS,"$ac_configure_args",[Arguments passed to the configure script]) # Can we make status line about the compilation result? -AC_CHECK_PROG(MD5SUM,md5sum,`which md5sum`) -if test x$MD5SUM != xno ; then - build_version=`find . -name '*.[ch]' |grep -v src/ucontext_stack.h | grep -v src/gras_config.h |\ - xargs cat| $MD5SUM | sed 's/ .*$//'` -else - build_version="no_md5sum_binary" -fi -build_id="$PACKAGE ver=$VERSION build=$build_version args=\"$ac_configure_args\"" +dnl A C_CHECK_PROG(MD5SUM,md5sum,`which md5sum`) +build_id="$PACKAGE ver=$VERSION args=\"$ac_configure_args\"" AC_SUBST(build_id) ################### @@ -498,7 +490,7 @@ AC_CONFIG_FILES([ Makefile include/Makefile src/Makefile - src/ucontext_stack.h + src/context_sysv_config.h ]) # Tools being embeeded in gramine (stub generator) @@ -507,6 +499,7 @@ AC_CONFIG_FILES([ tools/gras/Makefile tools/tesh/Makefile ]) +# tools/tesh2/Makefile # GRAMINE_CUT_BEGIN @@ -517,6 +510,7 @@ AC_CONFIG_FILES([ ],[ for file in \ tools/graspe-slave tools/graspe-master \ + checkall examples/java/runtest \ ; do \ test -e $file && chmod +x $file; \ done @@ -570,17 +564,26 @@ AC_CONFIG_FILES([ examples/gras/spawn/Makefile examples/gras/synchro/Makefile examples/gras/timer/Makefile + examples/gras/properties/Makefile examples/gras/chrono/Makefile examples/gras/mutual_exclusion/simple_token/Makefile examples/gras/mmrpc/Makefile 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