X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/59a1aff0fbe12fa74b7d0b9fb46492fa7a822acc..7c5b4b893f4994a61c26e794c8b8c9fc6576aea2:/configure.ac

diff --git a/configure.ac b/configure.ac
index bd78f56659..81b6ef1f9a 100644
--- 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.94-cvs],[simgrid2-users@listes.ens-lyon.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
@@ -78,7 +78,7 @@ if test "x$with_context" = "xucontext" ; then
       AC_MSG_RESULT(there is no ucontext on windows, and none is needed.")
     else
       AC_MSG_RESULT([[no working ucontext found. Falling back to pthreads]])
-      with_context=pthreads
+      with_context=pthread
     fi
   fi
 fi
@@ -123,8 +123,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)
@@ -146,8 +148,8 @@ 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
@@ -170,7 +172,7 @@ AC_CONFIG_FILES([
       examples/gras/chrono/Makefile examples/gras/chrono/test_sg examples/gras/chrono/test_rl
   doc/Makefile
     doc/Doxyfile.main           doc/Doxyfile.API          doc/Doxyfile.Examples   
-  tools/compile-remote-worker tools/Makefile
+  tools/graspe-slave            tools/Makefile
     tools/gras/Makefile
   testsuite/Makefile
   testsuite/run_tests    
@@ -180,11 +182,11 @@ AC_CONFIG_FILES([
     for file in                                                 \
      testsuite/run_tests                                        \
      testsuite/gras/trp_tcp_usage testsuite/gras/trp_file_usage \
-     tools/compile-remote-worker                                \
+     tools/graspe-slave           tools/graspe-master           \
      examples/msg/run_msg_test                                  \
      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/gras/chrono/test_sg examples/gras/chrono/test_rl  \
     ; do                                                        \
       test -e $file && chmod +x $file;                          \
     done
@@ -205,7 +207,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}