I don't think it does what it should now but at least it looks better and

[simgrid.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 4a291de..9ceaa7f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 ##
 
 AC_PREREQ(2.59)
-AC_INIT([simgrid],[2.95],[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,22 @@ 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])
+                
+# 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
@@ -182,7 +195,7 @@ 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
 
@@ -210,6 +223,16 @@ 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
+
 ###################
 ## Makes the output
 ##
@@ -232,6 +255,11 @@ AC_CONFIG_FILES([
       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/p2p/Makefile
+      examples/gras/p2p/chord/Makefile examples/gras/p2p/chord/test_sg examples/gras/p2p/chord/test_rl
+      
     examples/amok/Makefile       
       examples/amok/bandwidth/Makefile examples/amok/bandwidth/test_sg examples/amok/bandwidth/test_rl
   doc/Makefile
@@ -253,6 +281,8 @@ AC_CONFIG_FILES([
      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/p2p/chord/test_sg examples/gras/p2p/chord/test_rl  \
      examples/msg/run_msg_test                                  \
     ; do                                                        \
       test -e $file && chmod +x $file;                          \