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 52a9d5a..a342714 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl GNU LGPL (v2.1) licence.
 ##
 
 AC_PREREQ(2.59)
 ##
 
 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_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
 ##
 ###############
 ## 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`"
   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
 
 ###############
 ## System checks


@@ -534,9 +539,10 @@ AC_CONFIG_FILES([
     done
 ])
 
     done
 ])
 

-# Testsuite
+# build tools && Testsuite

 
 AC_CONFIG_FILES([  
 
 AC_CONFIG_FILES([  

+  buildtools/Makefile

   testsuite/Makefile
   testsuite/run_tests    
 ],[
   testsuite/Makefile
   testsuite/run_tests    
 ],[