Added xbt_os_time and xbt_os_sleep. Execute in the real and simulate systems.

[simgrid.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index af3d1ee..f846d66 100644 (file)
--- 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) 
@@ -179,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.)
-fi
-AM_CONDITIONAL(USE_SIMIX,test x$enable_simix != xno)
-
 #########################################
 ## Check for libraries extra-dependencies
 ##
@@ -232,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)
@@ -267,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
@@ -299,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
 ##
@@ -416,6 +423,7 @@ AC_CONFIG_FILES([
 #      examples/gras/p2p/chord/Makefile
 #      examples/gras/p2p/can/Makefile
 
+
 AC_CONFIG_FILES([
   examples/Makefile 
     examples/msg/Makefile
@@ -425,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                                                 \
      \