New tesh file for the msg actions (plus some little fixes to make it work)

[simgrid.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index aae4941..b512112 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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"
@@ -449,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 (you may want to install the liblua5.1-0-dev package)"
+     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)