Take care of xbt/log.c file during supernovae mode.

[simgrid.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index bfb838f..2a3d527 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -9,12 +9,12 @@ dnl GNU LGPL (v2.1) licence.
 ##
 
 AC_PREREQ(2.59)
-AC_INIT([simgrid],[3.3.4-svn],[simgrid-devel@lists.gforge.inria.fr])
+AC_INIT([simgrid],[3.3.5-svn],[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
 
-AC_REVISION($Revision: 6267 $)
+AC_REVISION($Revision: 6998 $)
 AC_CANONICAL_TARGET
 AC_LANG([C])
 AC_PROG_CXX
@@ -38,8 +38,13 @@ AC_PROG_LIBTOOL
 if test -e .svn && echo $VERSION | grep -q svn; then
   VERSION="$VERSION-r`svnversion`"
   PACKAGE_VERSION="$PACKAGE_VERSION-r`svnversion`"
-  PACKAGE_STRING="$PACKAGE_STRING r`svnversion`"  
-fi
+  PACKAGE_STRING="$PACKAGE_STRING r`svnversion`"
+else if test -e .git && echo $VERSION | grep -q svn; then
+  ver=`git log --oneline -1 | sed 's| .*||'`
+  VERSION=`echo "$VERSION-r$ver" | sed 's/svn/git/'`
+  PACKAGE_VERSION=`echo "$PACKAGE_VERSION-r$ver" | sed 's/svn/git/'`
+  PACKAGE_STRING=`echo "$PACKAGE_STRING r$ver" | sed 's/svn/git/'`
+fi fi
 
 ###############
 ## System checks
@@ -425,6 +430,25 @@ AC_MSG_RESULT(decide whether to compile java bindings... $use_java)
 AM_CONDITIONAL(HAVE_JAVA,test "x$use_java" = "xyes")
 
 
+SG_CONFIGURE_PART(Checking Lua bindings...)
+AC_ARG_ENABLE(lua,
+             AS_HELP_STRING([--disable-lua], [To not compile the Lua bindings even if the tools are found]),
+             disable_lua=$enableval,disable_lua=yes)
+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
+     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"
+  fi
+fi
+AC_MSG_RESULT(decide whether to compile lua bindings... $use_lua)
+AM_CONDITIONAL(HAVE_LUA,test "x$use_lua" = "xyes")
+
 #####################
 ## Check for programs
 ##
@@ -448,7 +472,9 @@ AM_CONDITIONAL(HAVE_FLEXML,test x$FLEXML != xNOTFOUND)
 
 # Check for doxygen when in maintainer mode which is helpful to build doc & dist
 AC_PATH_PROG(DOXYGEN,doxygen,`which doxygen`)
-AM_CONDITIONAL(HAVE_DOXYGEN,test x$DOXYGEN != x)
+AC_PATH_PROG(FIG2DEV,fig2dev,`which fig2dev`)
+AM_CONDITIONAL(HAVE_DOXYGEN,test x$DOXYGEN != x &&
+                            test x$FIG2DEV != x)
 
 # Can we rebuild the publication list from the bib file?
 AC_CHECK_PROG(BIBTEX,bibtex,`which flexml`,NOTFOUND)
@@ -534,9 +560,10 @@ AC_CONFIG_FILES([
     done
 ])
 
-# Testsuite
+# build tools && Testsuite
 
 AC_CONFIG_FILES([  
+  buildtools/Makefile
   testsuite/Makefile
   testsuite/run_tests    
 ],[
@@ -621,6 +648,7 @@ Configuration of package \`${PACKAGE}' (version ${VERSION}) on $gras_arch_name (
 
        Context backend: ${with_context}
        Compile Java:    ${use_java}
+       Compile Lua:     ${use_lua}
        
        Maintainer mode: ${USE_MAINTAINER_MODE}
        Supernovae mode: ${supernovae}