X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/030a5011922ca9ac7d471362d5c8d820f052ff26..26860eef5251a64ec0441bd4c2e0181515d577b2:/configure.ac

diff --git a/configure.ac b/configure.ac
index b7f3cd221c..6ca5d44391 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 ##
 
 AC_PREREQ(2.59)
-AC_INIT([simgrid],[2.95-cvs],[simgrid-devel@lists.gforge.inria.fr])
+AC_INIT([simgrid],[3.0.2-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
@@ -26,6 +26,7 @@ AC_PROG_CC(xlC gcc cc)
 AM_SANITY_CHECK
 AC_PROG_MAKE_SET
 AC_CHECK_PRINTF_NULL
+AC_CHECK_VA_COPY
 
 # Checks for header files.
 AC_HEADER_STDC
@@ -34,10 +35,23 @@ AC_CHECK_HEADERS([sys/socket.h \
                   sys/stat.h \
 		  windows.h winsock.h winsock2.h \
 		  sys/time.h \
-		  errno.h unistd.h ])
+		  errno.h unistd.h \
+		  execinfo.h])
 AC_CHECK_FUNCS([gettimeofday usleep \
                 getdtablesize \
-                sysconf])
+                sysconf\
+                readv\
+		popen])
+                
+# check for a working snprintf (or use xbt/snprintf.c, which comes from http://www.ijs.si/software/snprintf/)
+AC_FUNC_SNPRINTF
+# check for asprintf function familly (or request the replacements from xbt/snprintf.c)
+AC_CHECK_FUNC(  asprintf, :,   AC_DEFINE(NEED_ASPRINTF,  1,  enable the asprintf   replacement))
+AC_CHECK_FUNC( vasprintf, :,   AC_DEFINE(NEED_VASPRINTF, 1,  enable the vasprintf  replacement))
+# we don't use those:
+# A C_CHECK_FUNC( asnprintf, :,   A C_DEFINE(NEED_ASNPRINTF,  1, enable the asnprintf  replacement))
+# A C_CHECK_FUNC(vasnprintf, :,   A C_DEFINE(NEED_VASNPRINTF, 1, enable the vansprintf replacement))
+
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -84,7 +98,13 @@ if test ".$mcsc" = .yes; then
 elif test ".$pthread" = .yes; then
    pthread=yes
 else
-    AC_ERROR([no appropriate backend found])
+    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
+      windows_context=yes
+    else
+      AC_ERROR([no appropriate backend found])
+    fi
 fi
 
 dnl #
@@ -98,6 +118,7 @@ AC_ARG_WITH(context,
 case $with_context in
  ucontext) ;;
  pthread) ;;
+ windows) ;;
  auto) with_context=ucontext;;
  *) AC_MSG_ERROR("--with-context must be either ucontext or pthread") ;;
 esac
@@ -107,12 +128,11 @@ if test "x$with_context" = "xucontext" ; then
     AC_MSG_RESULT(found working ucontext. 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(there is no ucontext on windows, and none is needed.")
+    if test ".$windows_context" = .yes ; then
+      AC_MSG_RESULT(use windows context portability layer.)
+      with_context=windows
     else
-      AC_MSG_RESULT([[no working ucontext found. Falling back to pthreads]])
+      AC_MSG_RESULT([[no working ucontext found. Try pthreads as a fallback]])
       with_context=pthread
     fi
   fi
@@ -176,13 +196,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
@@ -204,12 +228,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
 
@@ -223,11 +263,20 @@ 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/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/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
@@ -242,11 +291,17 @@ 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/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;                          \
@@ -270,10 +325,12 @@ echo "
 
 Configuration of package \`${PACKAGE}' (version ${VERSION}) on $gras_arch_name (=$gras_arch):
 
-	Compiler:	${CC}
+	Compiler:	 ${CC} (version: ${GCC_VERSION})
+	
+	CFlags:		 ${CFLAGS}
+	LDFlags:	 ${LDFLAGS}
 
-	CFlags:		${CFLAGS}
-	LDFlags:	${LDFLAGS}
+	Context backend: ${with_context}
 "
 
 exit 0;