amok examples revival; cosmetics

[simgrid.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 28f9fb3..528dad1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 ##
 
 AC_PREREQ(2.59)
-AC_INIT([simgrid],[2.93-cvs],[simgrid2-users@listes.ens-lyon.fr])
+AC_INIT([simgrid],[2.95-cvs],[simgrid-devel@lists.gforge.inria.fr])
 AC_CONFIG_SRCDIR([include/gras.h])
 AC_CONFIG_HEADERS([src/gras_config.h])
 # A CI_PREREQ(2003.01.16) # We need a recent ACI when having sub-modules
@@ -19,9 +19,9 @@ ACLOCAL="$ACLOCAL -I acmacro"
 AC_PROG_LIBTOOL
 
 ###############
-## Basic checks
+## System checks
 ##
-
+SG_CONFIGURE_PART(System checks...)
 AC_PROG_CC(xlC gcc cc)
 AM_SANITY_CHECK
 AC_PROG_MAKE_SET
@@ -48,12 +48,14 @@ AC_TYPE_SIZE_T
 ## SimGrid and GRAS specific checks
 ##
 
+SG_CONFIGURE_PART(Checking GRAS architecture signature...)
 # Check architecture signature begin
 GRAS_ARCH
 # Check architecture signature end
 GRAS_CHECK_STRUCT_COMPACTION
 
 
+SG_CONFIGURE_PART([Checking for threads, contexts or assimilated...])
 AC_CHECK_UCONTEXT
 AC_MSG_CHECKING(on top of what can we build the contexts)
 AC_ARG_WITH(context,
@@ -96,6 +98,7 @@ fi
 ## Check for libraries extra-dependencies
 ##
 
+SG_CONFIGURE_PART(Checking extra libraries dependencies...)
 SIMGRID_DEP=""
 AC_SUBST([SIMGRID_DEP])
 
@@ -123,8 +126,10 @@ AC_SUBST([GRAS_DEP])
 AM_MAINTAINER_MODE
 if test x$USE_MAINTAINER_MODE = xyes 
 then
-   GNOME_COMPILE_WARNINGS(yes)
+   # Maintainers have no choice ! I'm a BOFH, and I plainly assume. [Mt]
+   enable_compile_warnings=yes
 fi
+SG_COMPILE_FLAGS
 
 AC_SUBST(CFLAGS)
 AC_SUBST(CPPFLAGS)
@@ -134,6 +139,7 @@ AC_SUBST(LDFLAGS)
 ## Check for programs
 ##
 
+SG_CONFIGURE_PART(Check for programs...)
 AC_CHECK_PROG(BASH, bash, `which bash`, /bin/sh)
 WARNING="This file is generated, do not edit"
 AC_SUBST(WARNING)
@@ -146,53 +152,60 @@ AC_PROG_FLEX(2.5.30)
 # Can we rebuild the xml-lexers from the XML specification?
 # if not, simply touch the flex source files (which are distributed in
 #  tarballs even if generated by flexml) and hope for the best.
-AC_CHECK_PROG(FLEXML,flexml,,NOTFOUND)
-AM_CONDITIONAL(HAVE_FLEXML,test x$FLEXML != NOTFOUND)
+AC_CHECK_PROG(FLEXML,flexml,`which flexml`,NOTFOUND)
+AM_CONDITIONAL(HAVE_FLEXML,test x$FLEXML != xNOTFOUND)
 
 ###################
 ## Makes the output
 ##
 
 
-#    examples/bandwidth/Makefile examples/bandwidth/test_sg
 #    examples/pastry/Makefile    examples/pastry/test_sg
+#      examples/gras/token/Makefile examples/gras/token/test_sg examples/gras/token/test_rl
+#      examples/gras/chord/Makefile  examples/gras/chord/test_sg examples/gras/chord/test_rl
 
+SG_CONFIGURE_PART(Generating files...)
 AC_CONFIG_FILES([
   Makefile
   include/Makefile
   src/Makefile
   src/amok/Makefile
   examples/Makefile 
-    examples/msg/Makefile          examples/msg/run_msg_test
+    examples/msg/Makefile           examples/msg/run_msg_test
     examples/gras/Makefile 
-      examples/gras/ping/Makefile  examples/gras/ping/test_sg  examples/gras/ping/test_rl
-      examples/gras/timer/Makefile examples/gras/timer/test_sg examples/gras/timer/test_rl
+      examples/gras/ping/Makefile   examples/gras/ping/test_sg  examples/gras/ping/test_rl
+      examples/gras/timer/Makefile  examples/gras/timer/test_sg examples/gras/timer/test_rl
       examples/gras/chrono/Makefile examples/gras/chrono/test_sg examples/gras/chrono/test_rl
+    examples/amok/Makefile       
+      examples/amok/bandwidth/Makefile examples/amok/bandwidth/test_sg
   doc/Makefile
-    doc/Doxyfile.main           doc/Doxyfile.API          doc/Doxyfile.Examples   
+    doc/Doxyfile
   tools/graspe-slave            tools/Makefile
     tools/gras/Makefile
   testsuite/Makefile
   testsuite/run_tests    
-  testsuite/gras/trp_tcp_usage
-  testsuite/gras/trp_file_usage
+  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 \
      tools/graspe-slave           tools/graspe-master           \
-     examples/msg/run_msg_test                                  \
+     \
+     examples/amok/bandwidth/test_sg examples/amok/bandwidth/test_rl \
+     \
      examples/gras/ping/test_sg   examples/gras/ping/test_rl    \
      examples/gras/timer/test_sg  examples/gras/timer/test_rl   \
      examples/gras/chrono/test_sg examples/gras/chrono/test_rl  \
+     \
+     examples/msg/run_msg_test                                  \
     ; do                                                        \
       test -e $file && chmod +x $file;                          \
     done
-    chmod +x $srcdir/tools/gras-check-arch;
 ])
 
+#     examples/gras/token/test_sg  examples/gras/token/test_rl   \
+#     examples/gras/chord/test_sg  examples/gras/chord/test_rl   \
 #    examples/gras/pastry/test_sg   
-#    examples/gras/bandwidth/test_sg 
 
 
 
@@ -205,7 +218,7 @@ AC_OUTPUT
 
 echo "
 
-Configuration of package \`${PACKAGE}' on $gras_arch_name (=$gras_arch):
+Configuration of package \`${PACKAGE}' (version ${VERSION}) on $gras_arch_name (=$gras_arch):
 
        Compiler:       ${CC}