X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2b470fc7653464e7e6cb440ca449beb41b5c9df1..4664c9757fb743652b03460ca4a08957cc0a249d:/configure

diff --git a/configure b/configure
index b823d7b07b..ee85e8753b 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 4603 .
+# From configure.ac Revision: 4740 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for simgrid 3.3-cvs.
 #
@@ -26000,8 +26000,8 @@ else
 fi
 
 
-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:"
@@ -26020,16 +26020,14 @@ echo "${ECHO_T}${T_MD}Check for Java bindings...${T_ME}" >&6; }
 # Java cruft
 # Check whether --enable-java was given.
 if test "${enable_java+set}" = set; then
-  enableval=$enable_java; want_java=$enableval
+  enableval=$enable_java; disable_java=$enableval
 else
-  want_java=yes
+  disable_java=yes
 fi
 
-if test "x$want_java" != "xyes" ; then
-   { echo "$as_me:$LINENO: checking whether to compile java bindings" >&5
+{ echo "$as_me:$LINENO: checking whether to compile java bindings" >&5
 echo $ECHO_N "checking whether to compile java bindings... $ECHO_C" >&6; }
-   { echo "$as_me:$LINENO: result: disabled by user" >&5
-echo "${ECHO_T}disabled by user" >&6; }
+if test "x$disable_java" != "xyes" ; then
    use_java="disabled by user"
 else
   # Extract the first word of "javac", so it can be a program name with args.
@@ -26300,8 +26298,6 @@ fi
 
 done
 
-  { echo "$as_me:$LINENO: checking whether to compile java bindings" >&5
-echo $ECHO_N "checking whether to compile java bindings... $ECHO_C" >&6; }
   if test -n "$JAVAC"   \
      && test -n "$JAVA" \
      && test -n "$JAR"  \
@@ -26311,9 +26307,9 @@ echo $ECHO_N "checking whether to compile java bindings... $ECHO_C" >&6; }
   else
      use_java="no"
   fi
-  { echo "$as_me:$LINENO: result: $use_java" >&5
-echo "${ECHO_T}$use_java" >&6; }
 fi
+{ echo "$as_me:$LINENO: result: $use_java" >&5
+echo "${ECHO_T}$use_java" >&6; }
  if test "x$use_java" = "xyes"; then
   HAVE_JAVA_TRUE=
   HAVE_JAVA_FALSE='#'
@@ -26868,12 +26864,10 @@ ac_config_files="$ac_config_files doc/Makefile doc/Doxyfile"
 #      examples/gras/p2p/chord/Makefile
 #      examples/gras/p2p/can/Makefile
 
-if test "x$use_java" = "xyes" ; then
 ac_config_files="$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="$ac_config_files examples/Makefile examples/msg/Makefile examples/simdag/Makefile 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"
+ac_config_files="$ac_config_files examples/Makefile examples/msg/Makefile examples/simdag/Makefile 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"
 
 
 ac_config_files="$ac_config_files src/smpi/smpicc src/smpi/smpirun"
@@ -27584,12 +27578,6 @@ do
     "examples/gras/pmm/Makefile") CONFIG_FILES="$CONFIG_FILES examples/gras/pmm/Makefile" ;;
     "examples/gras/all2all/Makefile") CONFIG_FILES="$CONFIG_FILES examples/gras/all2all/Makefile" ;;
     "examples/amok/Makefile") CONFIG_FILES="$CONFIG_FILES examples/amok/Makefile" ;;
-    "examples/amok/bandwidth/Makefile") CONFIG_FILES="$CONFIG_FILES examples/amok/bandwidth/Makefile" ;;
-    "examples/amok/bandwidth/test_sg") CONFIG_FILES="$CONFIG_FILES examples/amok/bandwidth/test_sg" ;;
-    "examples/amok/bandwidth/test_rl") CONFIG_FILES="$CONFIG_FILES examples/amok/bandwidth/test_rl" ;;
-    "examples/amok/saturate/Makefile") CONFIG_FILES="$CONFIG_FILES examples/amok/saturate/Makefile" ;;
-    "examples/amok/saturate/test_sg") CONFIG_FILES="$CONFIG_FILES examples/amok/saturate/test_sg" ;;
-    "examples/amok/saturate/test_rl") CONFIG_FILES="$CONFIG_FILES examples/amok/saturate/test_rl" ;;
     "src/smpi/smpicc") CONFIG_FILES="$CONFIG_FILES src/smpi/smpicc" ;;
     "src/smpi/smpirun") CONFIG_FILES="$CONFIG_FILES src/smpi/smpirun" ;;
 
@@ -28443,195 +28431,6 @@ done
       test -e $file && chmod +x $file;                          \
     done
  ;;
-    "examples/Makefile":F)
-    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
- ;;
-    "examples/msg/Makefile":F)
-    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
- ;;
-    "examples/simdag/Makefile":F)
-    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
- ;;
-    "examples/gras/Makefile":F)
-    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
- ;;
-    "examples/gras/ping/Makefile":F)
-    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
- ;;
-    "examples/gras/rpc/Makefile":F)
-    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
- ;;
-    "examples/gras/spawn/Makefile":F)
-    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
- ;;
-    "examples/gras/synchro/Makefile":F)
-    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
- ;;
-    "examples/gras/timer/Makefile":F)
-    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
- ;;
-    "examples/gras/chrono/Makefile":F)
-    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
- ;;
-    "examples/gras/mutual_exclusion/simple_token/Makefile":F)
-    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
- ;;
-    "examples/gras/mmrpc/Makefile":F)
-    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
- ;;
-    "examples/gras/pmm/Makefile":F)
-    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
- ;;
-    "examples/gras/all2all/Makefile":F)
-    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
- ;;
-    "examples/amok/Makefile":F)
-    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
- ;;
-    "examples/amok/bandwidth/Makefile":F)
-    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
- ;;
-    "examples/amok/bandwidth/test_sg":F)
-    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
- ;;
-    "examples/amok/bandwidth/test_rl":F)
-    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
- ;;
-    "examples/amok/saturate/Makefile":F)
-    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
- ;;
-    "examples/amok/saturate/test_sg":F)
-    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
- ;;
-    "examples/amok/saturate/test_rl":F)
-    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
- ;;
 
   esac
 done # for ac_tag
@@ -28676,9 +28475,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:"