X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d9575bda5bd6f7ca02d89bf74ba28b81a5215628..3f17e7a2d9e727cf8ba2da354280f3afd329c8a6:/configure.ac

diff --git a/configure.ac b/configure.ac
index 2b8d5d1fb0..a398013903 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 ##
 
 AC_PREREQ(2.59)
-AC_INIT([simgrid],[3.0.1-cvs],[simgrid-devel@lists.gforge.inria.fr])
+AC_INIT([simgrid],[3.1-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
@@ -40,7 +40,8 @@ AC_CHECK_HEADERS([sys/socket.h \
 AC_CHECK_FUNCS([gettimeofday usleep \
                 getdtablesize \
                 sysconf\
-                readv])
+                readv\
+		popen])
                 
 # check for a working snprintf (or use xbt/snprintf.c, which comes from http://www.ijs.si/software/snprintf/)
 AC_FUNC_SNPRINTF
@@ -111,6 +112,9 @@ dnl #  3. allow decision to be overridden by user
 dnl #
 
 AC_MSG_CHECKING(what kind of backend should we use)
+
+AC_ARG_WITH(pthread, [  --with-pthread   Use pthread instead of ucontext.],with_context=pthread)
+
 AC_ARG_WITH(context,
   [  --with-context=[ucontext/pthread]   Use either (System V) swapcontext or pthread [[default=auto]].],,
   with_context=auto)
@@ -195,13 +199,17 @@ AM_MAINTAINER_MODE
 if test x$USE_MAINTAINER_MODE = xyes 
 then
    # Maintainers have no choice ! I'm a BOFH, and I plainly assume. [Mt]
-   enable_compile_warnings=yes
+   enable_compile_warnings=yes   
 fi
 SG_COMPILE_FLAGS
 
 AC_SUBST(CFLAGS)
 AC_SUBST(CPPFLAGS)
 AC_SUBST(LDFLAGS)
+AC_SUBST([abs_builddir])
+AC_SUBST([abs_srcdir])
+AC_SUBST([abs_top_builddir])
+AC_SUBST([abs_top_srcdir])
 
 #####################
 ## Check for programs
@@ -223,12 +231,28 @@ AC_PROG_FLEX(2.5.30)
 AC_CHECK_PROG(FLEXML,flexml,`which flexml`,NOTFOUND)
 AM_CONDITIONAL(HAVE_FLEXML,test x$FLEXML != xNOTFOUND)
 
+if test x$USE_MAINTAINER_MODE = xyes 
+then
+   # Check for doxygen when in maintainer mode since dist* targets fail
+   # without it
+   AC_PATH_PROG(DOXYGEN,doxygen,`which doxygen`)
+   if test x$DOXYGEN = x ; then 
+     AC_MSG_ERROR([doxygen is mandatory in maintainer mode])
+   fi
+fi
+
+# Can we extract really usable backtraces? (also need the popen function)
+AC_PATH_PROG(ADDR2LINE, addr2line)
+if test x$ADDR2LINE != x ; then
+  AC_DEFINE_UNQUOTED(ADDR2LINE,"$ADDR2LINE",[Path to the addr2line tool])
+fi
+
 ###################
 ## Makes the output
 ##
 
 
-#    examples/pastry/Makefile    examples/pastry/test_sg
+#
 #      examples/gras/chord/Makefile  examples/gras/chord/test_sg examples/gras/chord/test_rl
 #  src/amok/Makefile
 
@@ -240,13 +264,24 @@ AC_CONFIG_FILES([
   src/ucontext_stack.h
   examples/Makefile 
     examples/msg/Makefile           examples/msg/run_msg_test
+    examples/simdag/Makefile
     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/rpc/Makefile    examples/gras/rpc/test_sg    examples/gras/rpc/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/gras/tokenS/Makefile examples/gras/tokenS/test_sg examples/gras/tokenS/test_rl
+      examples/gras/mmrpc/Makefile  examples/gras/mmrpc/test_sg  examples/gras/mmrpc/test_rl
+      examples/gras/pmm/Makefile    examples/gras/pmm/test_sg    examples/gras/pmm/test_rl
+      examples/gras/all2all/Makefile examples/gras/all2all/test_sg examples/gras/all2all/test_rl
+
+      examples/gras/p2p/Makefile
+      examples/gras/p2p/chord/Makefile examples/gras/p2p/chord/test_sg examples/gras/p2p/chord/test_rl
+      examples/gras/p2p/can/Makefile   examples/gras/p2p/can/test_sg   examples/gras/p2p/can/test_rl
+      
     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
   doc/Makefile
     doc/Doxyfile
   tools/graspe-slave            tools/Makefile
@@ -261,11 +296,18 @@ AC_CONFIG_FILES([
      tools/graspe-slave           tools/graspe-master           \
      \
      examples/amok/bandwidth/test_sg examples/amok/bandwidth/test_rl \
+     examples/amok/saturate/test_sg  examples/amok/saturate/test_rl \
      \
      examples/gras/ping/test_sg   examples/gras/ping/test_rl    \
+     examples/gras/rpc/test_sg    examples/gras/rpc/test_rl     \
      examples/gras/timer/test_sg  examples/gras/timer/test_rl   \
      examples/gras/chrono/test_sg examples/gras/chrono/test_rl  \
      examples/gras/tokenS/test_sg examples/gras/tokenS/test_rl  \
+     examples/gras/mmrpc/test_sg  examples/gras/mmrpc/test_rl   \
+     examples/gras/pmm/test_sg    examples/gras/pmm/test_rl     \
+     examples/gras/all2all/test_sg  examples/gras/all2all/test_rl   \
+     examples/gras/p2p/chord/test_sg examples/gras/p2p/chord/test_rl  \
+     examples/gras/p2p/can/test_sg   examples/gras/p2p/can/test_rl  \
      examples/msg/run_msg_test                                  \
     ; do                                                        \
       test -e $file && chmod +x $file;                          \
@@ -297,4 +339,13 @@ Configuration of package \`${PACKAGE}' (version ${VERSION}) on $gras_arch_name (
 	Context backend: ${with_context}
 "
 
+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: This is not really supported, so you should configure SimGrid like:"
+  echo "WARNING:"
+  echo "WARNING: ./configure --enable-maintainer-mode  $ac_configure_args"
+  echo "WARNING:"
+fi
+
 exit 0;