Added a dumb router to worksation model in order to provide GTNETS

[simgrid.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 8887eab..b3053e9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,7 @@ 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"
 
@@ -29,7 +29,7 @@ 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
@@ -217,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)
@@ -283,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
 ##
@@ -320,15 +352,6 @@ 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`)
@@ -409,16 +432,25 @@ AC_CONFIG_FILES([
 #      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/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/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
@@ -428,15 +460,9 @@ AC_CONFIG_FILES([
     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/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 \