X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c6de256871ef1335762ac0e0ec8ea1859b70b979..3cc9325535240d20ab9eab51ad116889b53bf20e:/configure.ac diff --git a/configure.ac b/configure.ac index c34a399dc1..7a7f5a69a2 100644 --- a/configure.ac +++ b/configure.ac @@ -110,6 +110,8 @@ else AC_ERROR([no appropriate backend found]) fi fi +AM_CONDITIONAL(IS_WINDOWS,test x$windows_context = xyes) + dnl # dnl # 3. allow decision to be overridden by user @@ -160,8 +162,9 @@ if test "x$with_context" = "xpthread"; then AC_CHECK_LIB(pthread,pthread_create,, [AC_MSG_ERROR([[Cannot find pthreads (try --with-context=ucontext if you haven't already tried).]])]) AC_DEFINE([CONTEXT_THREADS],1,[Define if xbt contexts are based on our threads implementation or not]) - AC_MSG_RESULT(You have pthreads. Let's use them.) + AC_MSG_RESULT(You have pthreads and requested for them. Fine.) fi +AM_CONDITIONAL(CONTEXT_THREADS,test "x$with_context" != xucontext) dnl # dnl # 4. determine a few additional details @@ -187,6 +190,7 @@ fi SG_CONFIGURE_PART(Checking extra libraries dependencies...) SIMGRID_DEP="" +SMPI_DEP="" GRAS_DEP="" if test xpthread=xyes ; then @@ -201,7 +205,6 @@ if test xpthread=xyes ; then fi fi - ######################################### ## Build optional modules (gtnets) ## @@ -212,21 +215,28 @@ AC_ARG_WITH(gtnets, if test "x$gtnets_path" = "xno" ; then AC_MSG_RESULT(Eventually you will come to GTNetS.) else - AC_MSG_RESULT(***** You have decided to use the experimental GTNetS. We hope you know what you're doing.. ****) + 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_CHECK_LIB(gtnets,Simulator.RunUntilNextCompletion,gtnets=yes, gtnets=no,-L$gtnets_path/lib) - AX_CXX_CHECK_LIB(gtnets,[Simulator::RunUntilNextCompletion],gtnets=yes, gtnets=no,-L$gtnets_path/lib) + AC_LANG_PUSH([C++]) + GTNETS_LDFLAGS="-lgtnets -L$gtnets_path/lib" + GTNETS_CPPFLAGS="-I$gtnets_path/include -I$gtnets_path/include/gtnets" + LDFLAGS_SAV=$LDFLAGS + CPPFLAGS_SAV=$CPPFLAGS + CPPFLAGS+=$GTNETS_CPPFLAGS + LDFLAGS+=$GTNETS_LDFLAGS + AC_TRY_LINK([ #include + ], [Simulator s; s.RunUntilNextCompletion();], gtnets=yes, gtnets=no) + CPPFLAGS=$CPPFLAGS_SAV + LDFLAGS=$LDFLAGS_SAV + AC_LANG_POP([C++]) if test "x$gtnets" = xyes ; then - GTNETS_CFLAGS=-I$gtnets_path/include - AC_SUBST([GTNETS_CFLAGS]) - GTNETS_LDFLAGS=-L$gtnets_path/lib - AC_SUBST([GTNETS_LDFLAGS]) + 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.) + AC_MSG_RESULT(Could not find any working gtnets library or not patched version, see config.log for details .) fi fi AM_CONDITIONAL(HAVE_GTNETS,test "x$gtnets" != xno) @@ -236,15 +246,24 @@ AM_CONDITIONAL(HAVE_GTNETS,test "x$gtnets" != xno) ## csdp=no AC_ARG_WITH(csdp, - AS_HELP_STRING([--with-csdp], [Path to csdp installation (default to empty, ie not using csdp)]), + AS_HELP_STRING([--with-csdp], [Path to csdp installation (default to empty, i.e. not using csdp)]), csdp_path="$withval",csdp_path="no") if test "x$csdp_path" = "xno" ; then AC_MSG_RESULT(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_RESULT(***** You have decided to use csdp. Let's check whether it works or not *****) AC_MSG_CHECKING(for csdp) - AC_CHECK_LIB(sdp,easy_sdp, csdp_lib=yes, csdp_lib=no,-L$csdp_path/lib -llapack -lblas -lm) - AC_CHECK_HEADER(declarations.h, csdp_header=yes, csdp_header=no,-I$csdp_path/include -I$csdp_path/include/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; @@ -252,11 +271,8 @@ else csdp=no; fi if test "x$csdp" = xyes; then - CSDP_CFLAGS="-I$csdp_path/include -I$csdp_path/include/csdp" - AC_SUBST([CSDP_CFLAGS]) - CSDP_LDFLAGS="-L$csdp_path/lib" - AC_SUBST([CSDP_LDFLAGS]) - SIMGRID_DEP="$SIMGRID_DEP $CSDP_LDFLAGS -lsdp -llapack -lblas -lm" + 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 @@ -266,6 +282,7 @@ fi AM_CONDITIONAL(HAVE_SDP,test x$csdp != xno) AC_SUBST([SIMGRID_DEP]) +AC_SUBST([SMPI_DEP]) AC_CHECK_LIB(nsl, gethostbyname, [GRAS_DEP="$GRAS_DEP -lnsl"]) AC_CHECK_LIB(socket, connect, [GRAS_DEP="$GRAS_DEP -lsocket"]) @@ -273,10 +290,12 @@ AC_CHECK_LIB(socket, connect, [GRAS_DEP="$GRAS_DEP -lsocket"]) AC_MSG_CHECKING(for extra dependencies of libgras) case $host_os in *mingw* ) GRAS_DEP="$GRAS_DEP -lws2_32" ; SIMGRID_DEP="$SIMGRID_DEP -lws2_32"; - AC_SUBST(AM_CFLAGS,-DDLL_EXPORT) + AM_CPPFLAGS="$AM_CPPFLAGS -DDLL_EXPORT" AC_DEFINE(CONTEXT_THREADS,1);; esac - + + + if test "x$GRAS_DEP" = x; then AC_MSG_RESULT(none) else @@ -307,31 +326,47 @@ then fi SG_COMPILE_FLAGS -AC_SUBST(CFLAGS) -AC_SUBST(CPPFLAGS) -AC_SUBST(LDFLAGS) +AC_SUBST([CFLAGS]) +AC_SUBST([CPPFLAGS]) +AC_SUBST([LDFLAGS]) +AC_SUBST([AM_CPPFLAGS]) AC_SUBST([abs_builddir]) AC_SUBST([abs_srcdir]) AC_SUBST([abs_top_builddir]) AC_SUBST([abs_top_srcdir]) +############################################## +## Specific mode for build daemons. +## (they compile the SVN without having the autotools installed) +AC_ARG_ENABLE(botbuild, + AS_HELP_STRING([--enable-botbuild], [Compilation mode for build daemons -- do not use it]), + botbuild=$enableval,botbuild=no) +AM_CONDITIONAL(BOTBUILD_MODE,test x$botbuild != xno) + +if test -e .svn && test x$USE_MAINTAINER_MODE != xyes && test x$botbuild != xyes ; then + echo "ERROR: " + echo "ERROR: You have to enable the maintainer mode to compile the SVN." + echo "ERROR: For this, just call configure this way:" + echo "ERROR:" + echo "ERROR: ./configure '--enable-maintainer-mode' $ac_configure_args" + echo "ERROR:" + exit 1 +fi SG_CONFIGURE_PART(Check for 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]), - want_java=$enableval,want_java=yes) -if test "x$want_java" != "xyes" ; then - AC_MSG_CHECKING(whether to compile java bindings) - AC_MSG_RESULT(disabled by user) + disable_java=$enableval,disable_java=yes) +AC_MSG_CHECKING(whether to compile java bindings) +if test "x$disable_java" != "xyes" ; then use_java="disabled by user" else AC_PATH_PROG([JAVAC], [javac], `which javac`) AC_PATH_PROG([JAVA], [java] , `which java`) AC_PATH_PROG([JAR], [jar] , `which jar`) AC_CHECK_HEADERS(jni.h) - AC_MSG_CHECKING(whether to compile java bindings) if test -n "$JAVAC" \ && test -n "$JAVA" \ && test -n "$JAR" \ @@ -341,8 +376,8 @@ else else use_java="no" fi - AC_MSG_RESULT($use_java) fi +AC_MSG_RESULT($use_java) AM_CONDITIONAL(HAVE_JAVA,test "x$use_java" = "xyes") ##################### @@ -440,16 +475,19 @@ AC_CONFIG_FILES([ AC_CONFIG_FILES([ testsuite/Makefile testsuite/run_tests - testsuite/gras/trp_tcp_usage testsuite/gras/trp_file_usage ],[ for file in \ testsuite/run_tests \ - testsuite/gras/trp_tcp_usage testsuite/gras/trp_file_usage \ ; do \ test -e $file && chmod +x $file; \ done ]) +# Teshsuite (testsuite using tesh) +AC_CONFIG_FILES([ + teshsuite/Makefile +]) + # Documentation AC_CONFIG_FILES([ doc/Makefile @@ -462,7 +500,6 @@ AC_CONFIG_FILES([ # examples/gras/p2p/chord/Makefile # examples/gras/p2p/can/Makefile -if test "x$use_java" = "xyes" ; then AC_CONFIG_FILES([ examples/java/Makefile examples/java/basic/Makefile @@ -470,12 +507,11 @@ AC_CONFIG_FILES([ examples/java/suspend/Makefile examples/java/ping_pong/Makefile ]) -fi AC_CONFIG_FILES([ examples/Makefile examples/msg/Makefile - examples/simdag/Makefile examples/simdag/test_simdag + examples/simdag/Makefile examples/gras/Makefile examples/gras/ping/Makefile examples/gras/rpc/Makefile @@ -488,19 +524,12 @@ AC_CONFIG_FILES([ examples/gras/pmm/Makefile examples/gras/all2all/Makefile examples/amok/Makefile - examples/amok/bandwidth/Makefile examples/amok/bandwidth/test_sg examples/amok/bandwidth/test_rl - examples/amok/saturate/Makefile examples/amok/saturate/test_sg examples/amok/saturate/test_rl -],[ - for file in \ - \ - examples/simdag/test_simdag \ - examples/amok/bandwidth/test_sg examples/amok/bandwidth/test_rl \ - examples/amok/saturate/test_sg examples/amok/saturate/test_rl \ - ; do \ - test -e $file && chmod +x $file; \ - done ]) +AC_CONFIG_FILES([ + src/smpi/smpicc + src/smpi/smpirun +]) # GRAMINE_CUT_END @@ -517,17 +546,25 @@ Configuration of package \`${PACKAGE}' (version ${VERSION}) on $gras_arch_name ( LDFlags: ${LDFLAGS} Context backend: ${with_context} + Compile Java: ${use_java} + + Maintainer mode: ${USE_MAINTAINER_MODE} + " +if test x$botbuild = xyes ; then + echo " This is a bot build. Do not specify --enable-botbuild if you are not a bot." + echo +fi -if test -e CVS && test x$USE_MAINTAINER_MODE != xyes ; then - echo "WARNING:" - echo "WARNING: you seem to compile the CVS version without the maintainer mode." - echo "WARNING: You won't be able to build archives that way (make dist is likely to fail). " - echo "WARNING: If you want to enable the maintainer mode, juste specify it like this:" +if test -e .svn && test x$USE_MAINTAINER_MODE != xyes && test x$botbuild = xyes ; then + echo "WARNING: " + echo "WARNING: You are compiling the SVN in botbuild mode. If you are not a daemon, don't do so. " + echo "WARNING: Remove the --enable-botbuild from your configure line, and add --enable-maintainer-mode instead." echo "WARNING:" - echo "WARNING: ./configure '--enable-maintainer-mode' $ac_configure_args" + echo "WARNING: You won't be able to build archives until then (make dist is likely to fail). " echo "WARNING:" fi + echo $build_id > stamp.configure exit 0;