X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cf83e2bdb40c0520e0e641e22d13c92a9d0135fd..a61bf0ab33d808be1a3a90d04befd71a55cdf6e5:/configure.ac

diff --git a/configure.ac b/configure.ac
index 96f482d3a2..e5116cb9ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
@@ -70,7 +75,7 @@ AC_CHECK_FUNCS([gettimeofday usleep \
   
 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_COMPILE_IFELSE([
+AC_LINK_IFELSE([
     #define _GNU_SOURCE
     #include <stdio.h>
     int main(void){
@@ -368,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])
@@ -541,9 +539,10 @@ AC_CONFIG_FILES([
     done
 ])
 
-# Testsuite
+# build tools && Testsuite
 
 AC_CONFIG_FILES([  
+  buildtools/Makefile
   testsuite/Makefile
   testsuite/run_tests    
 ],[