X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1e304251056df249996f9ac1c53aca1affcea98a..8427d714a3ffb1057671980c647d86441abd589f:/configure.ac

diff --git a/configure.ac b/configure.ac
index 261f16708a..08611ed371 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 ##
 
 AC_PREREQ(2.59)
-AC_INIT([simgrid],[3.0.2-cvs],[simgrid-devel@lists.gforge.inria.fr])
+AC_INIT([simgrid],[3.1.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
@@ -36,11 +36,14 @@ AC_CHECK_HEADERS([sys/socket.h \
 		  windows.h winsock.h winsock2.h \
 		  sys/time.h \
 		  errno.h unistd.h \
-		  execinfo.h])
+		  execinfo.h\
+		  signal.h ])
 AC_CHECK_FUNCS([gettimeofday usleep \
                 getdtablesize \
                 sysconf\
-                readv])
+                readv\
+		popen\
+		signal])
                 
 # check for a working snprintf (or use xbt/snprintf.c, which comes from http://www.ijs.si/software/snprintf/)
 AC_FUNC_SNPRINTF
@@ -111,6 +114,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)
@@ -202,6 +208,10 @@ 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
@@ -233,6 +243,12 @@ then
    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
 ##
@@ -250,13 +266,16 @@ AC_CONFIG_FILES([
   src/ucontext_stack.h
   examples/Makefile 
     examples/msg/Makefile           examples/msg/run_msg_test
+    examples/simdag/Makefile	    examples/simdag/test_simdag
     examples/gras/Makefile 
-      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/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/mutual_exclusion/simple_token/Makefile examples/gras/mutual_exclusion/simple_token/test_sg examples/gras/mutual_exclusion/simple_token/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
@@ -282,13 +301,17 @@ AC_CONFIG_FILES([
      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/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/mutual_exclusion/simple_token/test_sg examples/gras/mutual_exclusion/simple_token/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                                  \
+     examples/simdag/test_simdag				\
     ; do                                                        \
       test -e $file && chmod +x $file;                          \
     done
@@ -314,9 +337,19 @@ Configuration of package \`${PACKAGE}' (version ${VERSION}) on $gras_arch_name (
 	Compiler:	 ${CC} (version: ${GCC_VERSION})
 	
 	CFlags:		 ${CFLAGS}
+	CPPFlags:	 ${CPPFLAGS}
 	LDFlags:	 ${LDFLAGS}
 
 	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;