X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/65439f04e0b79d6730d8c4d28b62880630b90601..cc7cd93ed2970afc40cb0173c7f2921095df80a1:/configure.ac

diff --git a/configure.ac b/configure.ac
index 08fab5ddd2..3306fa7c6b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -110,6 +110,8 @@ else
       AC_ERROR([no appropriate backend found])
     fi
 fi
+AM_CONDITIONAL(IS_WINDOWS,test x$windows_context = xyes)
+
 
 dnl #
 dnl #  3. allow decision to be overridden by user
@@ -291,7 +293,9 @@ case $host_os in
             AM_CPPFLAGS="$AM_CPPFLAGS -DDLL_EXPORT"
             AC_DEFINE(CONTEXT_THREADS,1);;
 esac
-	   
+
+
+
 if test "x$GRAS_DEP" = x; then 
    AC_MSG_RESULT(none)
 else
@@ -331,6 +335,23 @@ AC_SUBST([abs_srcdir])
 AC_SUBST([abs_top_builddir])
 AC_SUBST([abs_top_srcdir])
 
+##############################################
+## Specific mode for build daemons.
+## (they compile the SVN without having the autotools installed)
+AC_ARG_ENABLE(botbuild,
+	      AS_HELP_STRING([--enable-botbuild], [Compilation mode for build daemons -- do not use it]),
+              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 != 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:"
+  echo "ERROR: ./configure '--enable-maintainer-mode' $ac_configure_args"
+  echo "ERROR:"
+  exit 1
+fi
 
 
 SG_CONFIGURE_PART(Check for Java bindings...)
@@ -456,16 +477,19 @@ AC_CONFIG_FILES([
 AC_CONFIG_FILES([  
   testsuite/Makefile
   testsuite/run_tests    
-  testsuite/gras/trp_tcp_usage  testsuite/gras/trp_file_usage
 ],[
     for file in                                                 \
      testsuite/run_tests                                        \
-     testsuite/gras/trp_tcp_usage testsuite/gras/trp_file_usage \
     ; do                                                        \
       test -e $file && chmod +x $file;                          \
     done
 ])
 
+# Teshsuite (testsuite using tesh)
+AC_CONFIG_FILES([  
+  teshsuite/Makefile
+])
+
 # Documentation
 AC_CONFIG_FILES([
   doc/Makefile
@@ -478,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
@@ -486,12 +509,11 @@ AC_CONFIG_FILES([
       examples/java/suspend/Makefile
       examples/java/ping_pong/Makefile
 ])
-fi
 
 AC_CONFIG_FILES([
   examples/Makefile 
     examples/msg/Makefile
-    examples/simdag/Makefile	    examples/simdag/test_simdag
+    examples/simdag/Makefile
     examples/gras/Makefile
       examples/gras/ping/Makefile   
       examples/gras/rpc/Makefile
@@ -509,7 +531,6 @@ AC_CONFIG_FILES([
 ],[
     for file in                                                 \
      \
-     examples/simdag/test_simdag				\
      examples/amok/bandwidth/test_sg examples/amok/bandwidth/test_rl \
      examples/amok/saturate/test_sg  examples/amok/saturate/test_rl \
     ; do                                                        \
@@ -537,17 +558,25 @@ 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 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 CVS && test x$USE_MAINTAINER_MODE != xyes ; then
-  echo "WARNING:"
-  echo "WARNING: you seem to compile the CVS version without the maintainer mode."
-  echo "WARNING: You won't be able to build archives that way (make dist is likely to fail). "
-  echo "WARNING: If you want to enable the maintainer mode, juste specify it like this:"
+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:"
-  echo "WARNING: ./configure '--enable-maintainer-mode' $ac_configure_args"
+  echo "WARNING: You won't be able to build archives until then (make dist is likely to fail). "
   echo "WARNING:"
 fi
+
 echo $build_id > stamp.configure
 
 exit 0;