From a6229182f68c6fe490de375437b1a7c5823369c9 Mon Sep 17 00:00:00 2001 From: mquinson Date: Sun, 8 Jul 2007 21:11:37 +0000 Subject: [PATCH 1/1] (kinda) working java wrappers by Malek and me git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@3686 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- configure.ac | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 7c28d55318..8887eab277 100644 --- a/configure.ac +++ b/configure.ac @@ -12,6 +12,7 @@ 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) @@ -251,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 @@ -320,6 +320,15 @@ if test x$ADDR2LINE != x ; then AC_DEFINE_UNQUOTED(ADDR2LINE,"$ADDR2LINE",[Path to the addr2line tool]) fi +# Java cruft +AC_PATH_PROG([JAVAC], [javac], `which javac`) +AC_PATH_PROG([JAVA], [java] , `which java`) +AC_PATH_PROG([JAR], [jar] , `which jar`) +AM_CONDITIONAL(HAVE_JAVA, + test -n "$JAVAC" && test -n "$JAVA" && test -n "$JAR") + + + AC_SUBST(ac_configure_args) # Can we make status line about the compilation result? AC_CHECK_PROG(MD5SUM,md5sum,`which md5sum`) @@ -400,6 +409,7 @@ AC_CONFIG_FILES([ # examples/gras/p2p/chord/Makefile # examples/gras/p2p/can/Makefile + AC_CONFIG_FILES([ examples/Makefile examples/msg/Makefile @@ -415,11 +425,14 @@ AC_CONFIG_FILES([ 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 \ \ -- 2.20.1