X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8267a61f91f5ed9e7368d3059e9d53b96cc8fcb7..cc067af3e26dfddeff7391d403540118a2914dea:/configure.ac diff --git a/configure.ac b/configure.ac index 9241aefe0b..3f30fa18ab 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ ## AC_PREREQ(2.59) -AC_INIT([simgrid],[3.2-cvs],[simgrid-devel@lists.gforge.inria.fr]) +AC_INIT([simgrid],[3.3-cvs],[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 @@ -12,17 +12,24 @@ AC_CONFIG_HEADERS([src/gras_config.h]) AC_REVISION($Revision$) AC_CANONICAL_TARGET AC_LANG([C]) +AM_PROG_GCJ -AM_INIT_AUTOMAKE(gnu) +AM_INIT_AUTOMAKE([gnu -Wno-portability]) AC_CONFIG_MACRO_DIR(acmacro) ACLOCAL="$ACLOCAL -I acmacro" + +dnl Next few lines is a hack to prevent libtool checking for F77 +m4_undefine([AC_PROG_F77]) +m4_defun([AC_PROG_F77],[]) + +dnl We do build a proper DLL when using win32 AC_LIBTOOL_WIN32_DLL AC_PROG_LIBTOOL ############### ## System checks ## -SG_CONFIGURE_PART(System checks...) +SG_CONFIGURE_PART([System checks...]) AC_PROG_CC(xlC gcc cc) AM_SANITY_CHECK AC_PROG_MAKE_SET @@ -111,6 +118,7 @@ dnl # AC_MSG_CHECKING(what kind of backend should we use) AC_ARG_WITH(pthread, [ --with-pthread Use pthread instead of ucontext.],with_context=pthread) +AC_ARG_WITH(pthread, [ --with-pthreads Use pthread instead of ucontext.],with_context=pthread) AC_ARG_WITH(context, [ --with-context=[ucontext/pthread] Use either (System V) swapcontext or pthread [[default=auto]].],, @@ -123,6 +131,7 @@ fi case $with_context in ucontext) ;; pthread) ;; + pthreads) ;; windows) ;; auto) with_context=ucontext;; *) AC_MSG_ERROR([--with-context must be either ucontext or pthread]) ;; @@ -143,6 +152,9 @@ if test "x$with_context" = "xucontext" ; then fi fi +if test "x$with_context" = "xpthreads"; then + with_context=pthread +fi if test "x$with_context" = "xpthread"; then AC_CHECK_HEADERS([pthread.h]) AC_CHECK_LIB(pthread,pthread_create,, @@ -168,42 +180,101 @@ dnl # direction of stack grow AC_CHECK_STACKSETUP(makecontext, pth_skaddr_makecontext, pth_sksize_makecontext) fi +######################################### +## Check for libraries extra-dependencies +## + +SG_CONFIGURE_PART(Checking extra libraries dependencies...) + +SIMGRID_DEP="" +GRAS_DEP="" + +if test xpthread=xyes ; then + # if the pthreads are usable + if test "x$with_context" = "xpthread" ; then + # if we use them to implement the xbt_context + SIMGRID_DEP="-lpthread" + fi + # we need them in any case for the gras lib (which is multithreaded), but on windows (of course) + if test "x$with_context" != "xwindows" ; then + GRAS_DEP="-lpthread" + fi +fi + ######################################### -## Build optional modules (simix) +## Build optional modules (gtnets) ## -SG_CONFIGURE_PART(Optional modules) -AC_ARG_ENABLE(simix, - AS_HELP_STRING([--enable-simix], [Use the new SimIX module (default=no)]), - enable_simix=$enableval,enable_simix=no) -if test "x$enable_simix" = "xyes" ; then - AC_MSG_RESULT("***** You have decided to use the experimental SimIX. We hope you know what you're doing.. ****") - AC_DEFINE(USE_SIMIX, 1, [Indicates whether we should use SimIX or not]) -else - AC_MSG_RESULT(Eventually you will come to SimIX: x$enable_simix) +gtnets=no +AC_ARG_WITH(gtnets, + AS_HELP_STRING([--with-gtnets], [Path to GTNetS installation (default to empty, ie not using GTNetS)]), + gtnets_path="$withval",gtnets_path="no") +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 exp˜erimental GTNetS. We hope you know what you're doing.. *****) + AC_MSG_CHECKING(for gtnets) + AC_LANG([C++]) + LDFLAGS_SAV=$LDFLAGS + LDFLAGS+="-lgtnets -L$gtnets_path/lib" + AC_TRY_LINK([ class Simulator{ + public: + double RunUntilNextCompletion(); + };], [Simulator s; s.RunUntilNextCompletion();], gtnets=yes, gtnets=no) + LDFLAGS=$LDFLAGS_SAV + AC_LANG(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]) + 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 fi -AM_CONDITIONAL(USE_SIMIX,test x$enable_simix != xno) +AM_CONDITIONAL(HAVE_GTNETS,test "x$gtnets" != xno) ######################################### -## Check for libraries extra-dependencies +## 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") +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_CHECKING(for csdp) + AC_CHECK_LIB(sdp,easy_sdp, csdp_lib=yes, csdp_lib=no,-L$csdp_path/lib -llapack -lblas -lm) + + CPPFLAGS_SAV=$CPPFLAGS + CPPFLAGS+="-I$csdp_path/include -I$csdp_path/include/csdp" + AC_CHECK_HEADER(declarations.h, csdp_header=yes, csdp_header=no, []) + CPPFLAGS=$CPPFLAGS_SAV -SG_CONFIGURE_PART(Checking extra libraries dependencies...) -SIMGRID_DEP="" -GRAS_DEP="" -AC_CHECK_LIB(pthread,pthread_create,SIMGRID_DEP="-lpthread"; GRAS_DEP="-lpthread") - -AC_MSG_CHECKING(for csdp) -sdp=no -AC_CHECK_LIB(sdp,sdp,csdp=yes, csdp=no,-llapack -lblas -lm) -if test "x$csdp" = xyes; then - SIMGRID_DEP="$SIMGRID_DEP -lsdp -llapack -lblas -lm" - 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; + if test "x$csdp_lib = xyes" -a "x$csdp_header = xyes" ; then + csdp=yes; + 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" + 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]) @@ -225,7 +296,6 @@ else fi AC_SUBST([GRAS_DEP]) - ############################################## ## Enhance maintainer mode and SUBST variables ## (must be placed after any compilation tests since our overprotective flags @@ -257,6 +327,36 @@ AC_SUBST([abs_srcdir]) AC_SUBST([abs_top_builddir]) AC_SUBST([abs_top_srcdir]) + + +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) + 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" \ + && test "x$ac_cv_header_jni_h" = "xyes" ; then + + use_java="yes" + else + use_java="no" + fi + AC_MSG_RESULT($use_java) +fi +AM_CONDITIONAL(HAVE_JAVA,test "x$use_java" = "xyes") + ##################### ## Check for programs ## @@ -330,8 +430,8 @@ AC_CONFIG_FILES([ AC_CONFIG_FILES([ tools/Makefile tools/gras/Makefile + tools/tesh/Makefile ]) -dnl tools/tesh/Makefile # GRAMINE_CUT_BEGIN @@ -370,58 +470,49 @@ AC_CONFIG_FILES([ # Examples +# examples/gras/p2p/Makefile +# 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 + examples/java/comm_time/Makefile + examples/java/suspend/Makefile + examples/java/ping_pong/Makefile +]) +fi + AC_CONFIG_FILES([ examples/Makefile - examples/msg/Makefile examples/msg/run_msg_test + examples/msg/Makefile examples/simdag/Makefile examples/simdag/test_simdag - examples/gras/Makefile - examples/gras/ping/Makefile examples/gras/ping/test_sg examples/gras/ping/test_rl - examples/gras/rpc/Makefile examples/gras/rpc/test_sg examples/gras/rpc/test_rl - examples/gras/timer/Makefile examples/gras/timer/test_sg examples/gras/timer/test_rl - examples/gras/chrono/Makefile examples/gras/chrono/test_sg examples/gras/chrono/test_rl - examples/gras/mutual_exclusion/simple_token/Makefile examples/gras/mutual_exclusion/simple_token/test_sg examples/gras/mutual_exclusion/simple_token/test_rl - examples/gras/mmrpc/Makefile examples/gras/mmrpc/test_sg examples/gras/mmrpc/test_rl - examples/gras/pmm/Makefile examples/gras/pmm/test_sg examples/gras/pmm/test_rl - examples/gras/all2all/Makefile examples/gras/all2all/test_sg examples/gras/all2all/test_rl - - examples/gras/p2p/Makefile - examples/gras/p2p/chord/Makefile examples/gras/p2p/chord/test_sg examples/gras/p2p/chord/test_rl - examples/gras/p2p/can/Makefile examples/gras/p2p/can/test_sg examples/gras/p2p/can/test_rl - + examples/gras/Makefile + examples/gras/ping/Makefile + examples/gras/rpc/Makefile + examples/gras/spawn/Makefile + examples/gras/synchro/Makefile + examples/gras/timer/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/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 \ - \ - examples/gras/ping/test_sg examples/gras/ping/test_rl \ - examples/gras/rpc/test_sg examples/gras/rpc/test_rl \ - examples/gras/timer/test_sg examples/gras/timer/test_rl \ - examples/gras/chrono/test_sg examples/gras/chrono/test_rl \ - examples/gras/mutual_exclusion/simple_token/test_sg examples/gras/mutual_exclusion/simple_token/test_rl \ - examples/gras/mmrpc/test_sg examples/gras/mmrpc/test_rl \ - examples/gras/pmm/test_sg examples/gras/pmm/test_rl \ - examples/gras/all2all/test_sg examples/gras/all2all/test_rl \ - examples/gras/p2p/chord/test_sg examples/gras/p2p/chord/test_rl \ - examples/gras/p2p/can/test_sg examples/gras/p2p/can/test_rl \ - examples/msg/run_msg_test \ - examples/simdag/test_simdag \ ; do \ test -e $file && chmod +x $file; \ done ]) -# examples/gras/chord/test_sg examples/gras/chord/test_rl \ -# examples/gras/pastry/test_sg - - - -# examples/gras/saturate/Makefile examples/gras/saturate/test_sg -# examples/gras/alnem/Makefile examples/gras/alnem/test_sg - # GRAMINE_CUT_END @@ -443,9 +534,10 @@ Configuration of package \`${PACKAGE}' (version ${VERSION}) on $gras_arch_name ( 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 may want to enable this by specifying:" + 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:" echo "WARNING:" - echo "WARNING: ./configure --enable-maintainer-mode $ac_configure_args" + echo "WARNING: ./configure '--enable-maintainer-mode' $ac_configure_args" echo "WARNING:" fi echo $build_id > stamp.configure