Remove a wrong assert. This condition isn't supposed to be true all the time: I didn...

[simgrid.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 3532750..69abf9a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -343,8 +343,8 @@ AC_ARG_ENABLE(botbuild,
               botbuild=$enableval,botbuild=no)
 AM_CONDITIONAL(BOTBUILD_MODE,test x$botbuild != xno)
 
-if test -e .svn && test x$USE_MAINTAINER_MODE != xyes && test x$botbuild != yes ; then
-  echo "ERROR:"
+if test -e .svn && test x$USE_MAINTAINER_MODE != xyes && test x$botbuild != xyes ; then
+  echo "ERROR: "
   echo "ERROR: You have to enable the maintainer mode to compile the SVN."
   echo "ERROR: For this, just call configure this way:"
   echo "ERROR:"
@@ -358,17 +358,17 @@ 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"
+elif test "x$with_context" = "xucontext" ; then
+   use_java="incompatibility with ucontext. Try --with-pthreads or --disable-java."
 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 +378,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 +502,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 +509,6 @@ AC_CONFIG_FILES([
       examples/java/suspend/Makefile
       examples/java/ping_pong/Makefile
 ])
-fi
 
 AC_CONFIG_FILES([
   examples/Makefile 
@@ -528,16 +526,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([
@@ -560,9 +548,18 @@ Configuration of package \`${PACKAGE}' (version ${VERSION}) on $gras_arch_name (
        LDFlags:         ${LDFLAGS}
 
        Context backend: ${with_context}
+       Compile Java:    ${use_java}
+       
+       Maintainer mode: ${USE_MAINTAINER_MODE}
+
 "
-if test -e .svn && test x$USE_MAINTAINER_MODE != xyes && test x$botbuild = yes ; then
-  echo "WARNING:"
+if test x$botbuild = xyes ; then
+  echo "        This is a bot build. Do not specify --enable-botbuild if you are not a bot."
+  echo
+fi
+
+if test -e .svn && test x$USE_MAINTAINER_MODE != xyes && test x$botbuild = xyes ; then
+  echo "WARNING: "
   echo "WARNING: You are compiling the SVN in botbuild mode. If you are not a daemon, don't do so. "
   echo "WARNING: Remove the --enable-botbuild from your configure line, and add --enable-maintainer-mode instead."
   echo "WARNING:"