X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/145a798531c6dfbabfd82409a682e7cd14a39362..b03617bf4f7a079013761ea9cd4697fb9ff08a11:/configure.ac diff --git a/configure.ac b/configure.ac index db58210a25..fd96814ed8 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,10 +12,17 @@ AC_CONFIG_HEADERS([src/gras_config.h]) AC_REVISION($Revision$) AC_CANONICAL_TARGET AC_LANG([C]) +AM_PROG_GCJ AM_INIT_AUTOMAKE(gnu) 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 @@ -124,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]) ;; @@ -144,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,, @@ -169,22 +180,6 @@ dnl # direction of stack grow AC_CHECK_STACKSETUP(makecontext, pth_skaddr_makecontext, pth_sksize_makecontext) fi - -######################################### -## Build optional modules (simix) -## -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) -fi -AM_CONDITIONAL(USE_SIMIX,test x$enable_simix != xno) - ######################################### ## Check for libraries extra-dependencies ## @@ -193,7 +188,38 @@ SG_CONFIGURE_PART(Checking extra libraries dependencies...) SIMGRID_DEP="" GRAS_DEP="" -AC_CHECK_LIB(pthread,pthread_create,SIMGRID_DEP="-lpthread"; GRAS_DEP="-lpthread") + +######################################### +## Build optional modules (gtnets) +## +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 experimental GTNetS. We hope you know what you're doing.. ****) + AC_DEFINE(USE_GTNETS, 1, [Indicates whether we should use GTNetS or not]) + if ! test -e $gtnets_path ; then + AC_MSG_ERROR(Provided path to GTNetS include files ($gtnets_path) do not exist!) + fi + 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 -lgtnets" +fi +AM_CONDITIONAL(USE_GTNETS,test "x$gtnets_path" != xNO) + +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) + GRAS_DEP="-lpthread" +fi AC_MSG_CHECKING(for csdp) sdp=no @@ -226,7 +252,6 @@ else fi AC_SUBST([GRAS_DEP]) - ############################################## ## Enhance maintainer mode and SUBST variables ## (must be placed after any compilation tests since our overprotective flags @@ -258,6 +283,27 @@ AC_SUBST([abs_srcdir]) AC_SUBST([abs_top_builddir]) AC_SUBST([abs_top_srcdir]) + + +SG_CONFIGURE_PART(Check for Java bindings...) +# Java cruft +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) +AM_CONDITIONAL(HAVE_JAVA,test "x$use_java"="xyes") + ##################### ## Check for programs ## @@ -331,8 +377,8 @@ AC_CONFIG_FILES([ AC_CONFIG_FILES([ tools/Makefile tools/gras/Makefile + tools/tesh/Makefile ]) -dnl tools/tesh/Makefile # GRAMINE_CUT_BEGIN @@ -371,58 +417,46 @@ AC_CONFIG_FILES([ # Examples +# examples/gras/p2p/Makefile +# examples/gras/p2p/chord/Makefile +# examples/gras/p2p/can/Makefile + + AC_CONFIG_FILES([ examples/Makefile - examples/msg/Makefile examples/msg/run_msg_test + examples/msg/Makefile + examples/msg/basic.tesh examples/msg/small_plat.tesh + examples/msg/suspend.tesh examples/msg/flexml_bypass.tesh 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/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 + examples/java/Makefile + examples/java/basic/Makefile + examples/java/comm_time/Makefile + examples/java/suspend/Makefile + examples/java/ping_pong/Makefile ],[ for file in \ \ - 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 \ + 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 ]) -# 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 @@ -444,9 +478,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