X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b9109e33f97818dd3f8cfd6ff989219730532c82..b4f00bf50283a629193daf4ae11616605b023abc:/configure.ac

diff --git a/configure.ac b/configure.ac
index 7c28d55318..f846d66353 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) 
@@ -216,8 +217,10 @@ if test xpthread=xyes ; 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)
@@ -251,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
@@ -283,6 +285,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
 ##
@@ -400,6 +423,7 @@ AC_CONFIG_FILES([
 #      examples/gras/p2p/chord/Makefile
 #      examples/gras/p2p/can/Makefile
 
+
 AC_CONFIG_FILES([
   examples/Makefile 
     examples/msg/Makefile
@@ -409,17 +433,22 @@ AC_CONFIG_FILES([
     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
+    examples/java/Makefile
+      examples/java/basic/Makefile
+      examples/java/comm_time/Makefile
+      examples/java/suspend/Makefile
+      examples/java/ping_pong/Makefile
 ],[
     for file in                                                 \
      \