X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f642a96437baf8ffa855db9417677fa6f64a2b6d..9372ee127d1ac95f44215fa0a8bbde01398b4a14:/configure.ac

diff --git a/configure.ac b/configure.ac
index 8e9d8bc121..af520247d7 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.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,46 +48,57 @@ 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
 
-AC_ARG_ENABLE(context,
-  [  --enable-context=[ucontext/pthread]   Use either (System V) swapcontext or pthread [[default=pthread]].],,
-  enable_context=pthread)
+
+SG_CONFIGURE_PART([Checking for threads, contexts or assimilated...])
+AC_CHECK_UCONTEXT
 AC_MSG_CHECKING(on top of what can we build the contexts)
-if test "x$enable_context" = "xucontext"; then
-  AC_CHECK_HEADERS([ucontext.h])
-  ac_header=ucontext.h
-  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-  if test `eval echo '${'$as_ac_Header'}'` = yes; then
+AC_ARG_WITH(context,
+  [  --with-context=[ucontext/pthread]   Use either (System V) swapcontext or pthread [[default=auto]].],,
+  with_context=auto)
+
+case $with_context in
+ ucontext) ;;
+ pthread) ;;
+ auto) with_context=ucontext;;
+ *) AC_MSG_ERROR("--with-context must be either ucontext or pthread") ;;
+esac
+
+if test "x$with_context" = "xucontext" ; then
+  if test "x$ac_check_ucontext" = "xyes"; then
     AC_MSG_RESULT(found ucontext.h. Great!)
+    AC_DEFINE([USE_UCONTEXT],1,[Define if we use ucontext or not])
   else
     ac_header=windows.h
     as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
     if test `eval echo '${'$as_ac_Header'}'` = yes; then
-      AC_MSG_RESULT(you don't have ucontext.h but we provide an alternative for windows so you should be fine.")
+      AC_MSG_RESULT(there is no ucontext on windows, and none is needed.")
     else
-      AC_MSG_RESULT([[cannot find ucontext. I'm going to try as if you had set --enable-context=pthreads !]])
-      enable_context=pthreads
+      AC_MSG_RESULT([[no working ucontext found. Falling back to pthreads]])
+      with_context=pthread
     fi
   fi
-else if test "x$enable_context" = "xpthread"; then
+fi
+
+if test "x$with_context" = "xpthread"; then
   AC_CHECK_HEADERS([pthread.h])
 dnl A C_CHECK_LIB(pthread, pthread_mutex_lock, LIBS="$LIBS -lpthread")
   AC_CHECK_LIB(pthread,pthread_create,,
-    [AC_MSG_ERROR([[Cannot find pthreads, no way (try --enable-context=ucontext if you haven't already tried).]])])
-  AC_DEFINE([USE_PTHREADS],1,[Define if we USE pthreads or not])
+    [AC_MSG_ERROR([[Cannot find pthreads, no way (try --with-context=ucontext if you haven't already tried).]])])
+  AC_DEFINE([USE_PTHREADS],1,[Define if we use pthreads or not])
   AC_MSG_RESULT(You have pthreads. Let's use them.)
-else 
-  AC_MSG_ERROR("--enable-context must be either ucontext or pthread")
-fi fi
+fi
 
 #########################################
 ## Check for libraries extra-dependencies
 ##
 
+SG_CONFIGURE_PART(Checking extra libraries dependencies...)
 SIMGRID_DEP=""
 AC_SUBST([SIMGRID_DEP])
 
@@ -115,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)
@@ -126,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)
@@ -138,8 +152,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
@@ -148,7 +162,10 @@ AM_CONDITIONAL(HAVE_FLEXML,test x$FLEXML != NOTFOUND)
 
 #    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
@@ -158,11 +175,11 @@ AC_CONFIG_FILES([
     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/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
   doc/Makefile
-    doc/Doxyfile.main           doc/Doxyfile.API          doc/Doxyfile.Examples   
-  tools/compile-remote-worker tools/Makefile
+    doc/Doxyfile
+  tools/graspe-slave            tools/Makefile
     tools/gras/Makefile
   testsuite/Makefile
   testsuite/run_tests    
@@ -172,17 +189,18 @@ 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
-    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 
 
@@ -197,7 +215,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}