Allow users to disable Java binding, even if the configure thinks it found the tools

[simgrid.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index f846d66..525ff79 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -289,21 +289,30 @@ AC_SUBST([abs_top_srcdir])
 
 SG_CONFIGURE_PART(Check for Java bindings...)
 # Java cruft
 
 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
+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"
+     use_java="yes"
+  else   
+     use_java="no"
+  fi
+  AC_MSG_RESULT($use_java)

 fi
 fi

-AC_MSG_RESULT($use_java)

 AM_CONDITIONAL(HAVE_JAVA,test "x$use_java" = "xyes")
 
 #####################
 AM_CONDITIONAL(HAVE_JAVA,test "x$use_java" = "xyes")
 
 #####################