Rename CTestCustom.ctest -> CTestConfig.cmake (so that cmake sees it when generating...

[simgrid.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 06423e4..e5116cb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -40,7 +40,7 @@ if test -e .svn && echo $VERSION | grep -q svn; then
   PACKAGE_VERSION="$PACKAGE_VERSION-r`svnversion`"
   PACKAGE_STRING="$PACKAGE_STRING r`svnversion`"
 else if test -e .git && echo $VERSION | grep -q svn; then
-  ver=`git describe --long --all | sed 's|.*/||'`
+  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/'`
@@ -539,9 +539,10 @@ AC_CONFIG_FILES([
     done
 ])
 
-# Testsuite
+# build tools && Testsuite
 
 AC_CONFIG_FILES([  
+  buildtools/Makefile
   testsuite/Makefile
   testsuite/run_tests    
 ],[