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

diff --git a/configure.ac b/configure.ac
index 3b86716f0d..79ddfa4b40 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,3 +1,8 @@
+dnl Copyright (C) 2004-2007. The SimGrid team. All rights reserved.
+
+dnl This file is part of the SimGrid project. This is free software:
+dnl You can redistribute and/or modify it under the terms of the
+dnl GNU LGPL (v2.1) licence.
 
 ######################
 ## Setup the autotools
@@ -358,17 +363,15 @@ 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)
+	      disable_java=$enableval,disable_java=yes)
+AC_MSG_CHECKING(whether to compile java bindings)
+if test "x$disable_java" != "xyes" ; then
    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"  \
@@ -378,8 +381,8 @@ else
   else   
      use_java="no"
   fi
-  AC_MSG_RESULT($use_java)
 fi
+AC_MSG_RESULT($use_java)
 AM_CONDITIONAL(HAVE_JAVA,test "x$use_java" = "xyes")
 
 #####################
@@ -502,7 +505,6 @@ 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
@@ -510,7 +512,6 @@ AC_CONFIG_FILES([
       examples/java/suspend/Makefile
       examples/java/ping_pong/Makefile
 ])
-fi
 
 AC_CONFIG_FILES([
   examples/Makefile 
@@ -528,16 +529,6 @@ AC_CONFIG_FILES([
       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/amok/bandwidth/test_sg examples/amok/bandwidth/test_rl \
-     examples/amok/saturate/test_sg  examples/amok/saturate/test_rl \
-    ; do                                                        \
-      test -e $file && chmod +x $file;                          \
-    done
 ])
 
 AC_CONFIG_FILES([