Revert last change. context in SG mean the API we have to give the context feature...

[simgrid.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index c64d987..08611ed 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 ##
 
 AC_PREREQ(2.59)
-AC_INIT([simgrid],[3.1-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,12 +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\
-               popen])
+               popen\
+               signal])
                 
 # check for a working snprintf (or use xbt/snprintf.c, which comes from http://www.ijs.si/software/snprintf/)
 AC_FUNC_SNPRINTF
@@ -112,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)
@@ -261,12 +266,13 @@ 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/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/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
@@ -298,13 +304,14 @@ AC_CONFIG_FILES([
      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
@@ -330,6 +337,7 @@ 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}