Setup the devel of v3.3.5, just in case anyone gets bored before new year ;)

[simgrid.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index fccc942..a342714 100644 (file)
--- 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.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
@@ -35,11 +35,16 @@ AC_PROG_LIBTOOL
 ###############
 ## SVN version check
 ##
-if test -e .svn && cat $VERSION | grep -q svn; then
+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
@@ -66,16 +71,38 @@ AC_CHECK_FUNCS([gettimeofday usleep \
                 sysconf\
                 readv\
                popen\
-               signal\
-               getline])
-                
+               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)
+AC_LINK_IFELSE([
+    #define _GNU_SOURCE
+    #include <stdio.h>
+    int main(void){
+      FILE * fp;
+      char * line = NULL;
+      size_t len = 0;
+      getline(&line, &len, fp);
+    }
+  ],[
+    AC_MSG_RESULT(found)
+  ],[
+    AC_SUBST(need_getline, ["#define SIMGRID_NEED_GETLINE 1 /* enable the getline replacement*/"])
+    AC_DEFINE(SIMGRID_NEED_GETLINE, 1, enable the getline replacement)
+    AC_MSG_RESULT(not found (activating internal implementation))
+  ])
+              
 # check for a working snprintf (or use xbt/snprintf.c, which comes from http://www.ijs.si/software/snprintf/)
 AC_FUNC_SNPRINTF
-# check for a working asprintf (or activate our replacement)
-AC_FUNC_ASPRINTF
 # check for asprintf function familly (or request the replacements from xbt/snprintf.c)
-dnl A C_CHECK_FUNC(  asprintf, :,   AC_DEFINE(NEED_ASPRINTF,  1,  enable the asprintf   replacement))
-dnl A C_CHECK_FUNC( vasprintf, :,   AC_DEFINE(NEED_VASPRINTF, 1,  enable the vasprintf  replacement))
+AC_CHECK_FUNC(  asprintf, :,[
+    AC_DEFINE(NEED_ASPRINTF,  1,  enable the asprintf replacement)
+    AC_SUBST(need_asprintf, ["#define SIMGRID_NEED_ASPRINTF 1 /* enable the asprintf replacement */"]) 
+   ])
+AC_CHECK_FUNC( vasprintf, :,[
+    AC_DEFINE(NEED_VASPRINTF, 1,  enable the vasprintf replacement)
+    AC_SUBST(need_vasprintf, ["#define SIMGRID_NEED_VASPRINTF 1 /*enable the vasprintf replacement */"]) 
+   ])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -346,17 +373,10 @@ SG_COMPILE_FLAGS
 ##
 ## Support for the supernovae compilation mode
 ##
-if test x$USE_MAINTAINER_MODE = xyes 
-then
-   not_maintainer_mode=no
-else
-   not_maintainer_mode=yes
-fi
-
 AC_ARG_ENABLE(supernovae,
               AS_HELP_STRING([--enable-supernovae],[Put the whole library in one compilation unit only to help gcc optimizing the code]),
              [supernovae=$enableval],
-             [supernovae=$not_maintainer_mode])
+             [supernovae=no])
 AM_CONDITIONAL(SUPERNOVAE_MODE, test x$supernovae != xno)
 
 AC_SUBST([CFLAGS])
@@ -490,6 +510,7 @@ SG_CONFIGURE_PART(Generating files...)
 AC_CONFIG_FILES([
   Makefile
   include/Makefile
+  include/simgrid_config.h
   src/Makefile
   src/context_sysv_config.h
 ])
@@ -518,9 +539,10 @@ AC_CONFIG_FILES([
     done
 ])
 
-# Testsuite
+# build tools && Testsuite
 
 AC_CONFIG_FILES([  
+  buildtools/Makefile
   testsuite/Makefile
   testsuite/run_tests    
 ],[