X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d02a6d7da1983ff1355fbf27bb206831a186c683..270e80029037e77694ef6514c2028334c2a43afc:/configure.ac diff --git a/configure.ac b/configure.ac index 067424b2cb..b3053e9496 100644 --- a/configure.ac +++ b/configure.ac @@ -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 @@ -173,21 +180,14 @@ dnl # direction of stack grow AC_CHECK_STACKSETUP(makecontext, pth_skaddr_makecontext, pth_sksize_makecontext) fi - ######################################### -## Build optional modules (simix) +## Check for libraries extra-dependencies ## -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.) -fi -AM_CONDITIONAL(USE_SIMIX,test x$enable_simix != xno) + +SG_CONFIGURE_PART(Checking extra libraries dependencies...) + +SIMGRID_DEP="" +GRAS_DEP="" ######################################### ## Build optional modules (gtnets) @@ -196,7 +196,7 @@ 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. $gtnets_path) + 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]) @@ -206,26 +206,21 @@ else GTNETS_CFLAGS=-I$gtnets_path/include AC_SUBST([GTNETS_CFLAGS]) GTNETS_LDFLAGS=-L$gtnets_path/lib - AC_SUBST([GTNETS_LDFLAGS]) + AC_SUBST([GTNETS_LDFLAGS]) + SIMGRID_DEP="$SIMGRID_DEP $GTNETS_LDFLAGS -lgtnets" fi AM_CONDITIONAL(USE_GTNETS,test "x$gtnets_path" != xNO) -######################################### -## 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) - GRAS_DEP="-lpthread" + # 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 AC_MSG_CHECKING(for csdp) @@ -259,7 +254,6 @@ else fi AC_SUBST([GRAS_DEP]) - ############################################## ## Enhance maintainer mode and SUBST variables ## (must be placed after any compilation tests since our overprotective flags @@ -291,6 +285,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 ## @@ -404,58 +428,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/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