X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2d463157519de9760cdb7403a1548093944400d0..9ce5fa048b590a9b36685485ddf713718c5de392:/configure.ac

diff --git a/configure.ac b/configure.ac
index 17799c434d..b512112f99 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl GNU LGPL (v2.1) licence.
 ##
 
 AC_PREREQ(2.59)
-AC_INIT([simgrid],[3.3.5-svn],[simgrid-devel@lists.gforge.inria.fr])
+AC_INIT([simgrid],[3.4.1],[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
@@ -20,6 +20,14 @@ AC_LANG([C])
 AC_PROG_CXX
 AM_PROG_GCJ
 
+dnl ########### Addition for mmalloc (to be integrated into Cmake tools)
+AC_FUNC_MMAP
+AC_CHECK_HEADERS(limits.h stddef.h unistd.h)
+
+BFD_NEED_DECLARATION(sbrk)
+BFD_NEED_DECLARATION(getpagesize)
+dnl ########### end of addition for mmalloc
+
 AM_INIT_AUTOMAKE([gnu -Wno-portability])
 AC_CONFIG_MACRO_DIR(acmacro) 
 ACLOCAL="$ACLOCAL -I acmacro"
@@ -32,6 +40,11 @@ dnl We do build a proper DLL when using win32
 AC_LIBTOOL_WIN32_DLL
 AC_PROG_LIBTOOL
 
+SIMGRID_DEP=""
+SMPI_DEP=""
+GRAS_DEP=""
+
+
 ###############
 ## SVN version check
 ##
@@ -71,7 +84,7 @@ AC_CHECK_FUNCS([gettimeofday usleep \
                 sysconf\
                 readv\
 		popen\
-		signal])
+		signal])	   
   
 dnl GNU systems before POSIX2008 need the _GNU_SOURCE definition to find getline (and simgrid does pass this)             
 AC_MSG_CHECKING(a usable getline)
@@ -91,7 +104,14 @@ AC_LINK_IFELSE([
     AC_DEFINE(SIMGRID_NEED_GETLINE, 1, enable the getline replacement)
     AC_MSG_RESULT(not found (activating internal implementation))
   ])
-              
+
+dnl AC_MSG_CHECKING(POSIX timer functions)
+AC_CHECK_LIB(rt, [clock_gettime], [
+    AC_DEFINE(HAVE_POSIX_GETTIME, 1, POSIX timer functions were found)
+    SIMGRID_DEP="$SIMGRID_DEP -lrt"
+    GRAS_DEP="$GRAS_DEP -lrt"
+  ])
+
 # 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)
@@ -273,19 +293,15 @@ fi
 
 SG_CONFIGURE_PART(Checking extra libraries dependencies...)
 
-SIMGRID_DEP=""
-SMPI_DEP=""
-GRAS_DEP=""
-
 if test xpthread=xyes ; then 
   # if the pthreads are usable
   if test "x$with_context" = "xpthread" ; then
     # if we use them to implement the xbt_context
-    SIMGRID_DEP="-lpthread"
+    SIMGRID_DEP="$SIMGRID_DEP -lpthread"
   fi
   # we need them in any case for the gras lib (which is multithreaded), but on windows (of course)
   if test "x$with_context" != "xwindows" ; then
-    GRAS_DEP="-lpthread"
+    GRAS_DEP="$GRAS_DEP -lpthread"
   fi
 fi
 AC_SEARCH_LIBS([connect],[socket],[],[],[]) # need -lsocket on solaris
@@ -370,6 +386,10 @@ then
 fi
 SG_COMPILE_FLAGS
 
+##
+## Support for tracing instrumentation (no longer supported in autotools)
+##
+
 ##
 ## Support for the supernovae compilation mode
 ##
@@ -437,13 +457,13 @@ AC_ARG_ENABLE(lua,
 if test "x$disable_lua" != "xyes" ; then
    use_lua="disabled by user"
 else
-  AC_CHECK_HEADERS(lua5.1/lualib.h)
-  if test "x$ac_cv_header_lua5_1_lualib_h" = "xyes" ; then
+  AC_CHECK_HEADERS(lualib.h)
+  if test "x$ac_cv_header_lualib_h" = "xyes" ; then
      use_lua="yes"
      AC_DEFINE(HAVE_LUA,1, [defines whether Lua bindings must be compiled or not])
      SIMGRID_DEP="${SIMGRID_DEP} -ldl -llua5.1"
   else   
-     use_lua="no"
+     use_lua="no (you may want to install the liblua5.1-0-dev package, or pass CFLAGS=-I/usr/include/lua5.1)"
   fi
 fi
 AC_MSG_RESULT(decide whether to compile lua bindings... $use_lua)