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

diff --git a/configure.ac b/configure.ac
index 88bdf2a778..2ecf7eca95 100644
--- 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
@@ -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
@@ -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])
@@ -455,7 +453,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)
@@ -541,9 +541,10 @@ AC_CONFIG_FILES([
     done
 ])
 
-# Testsuite
+# build tools && Testsuite
 
 AC_CONFIG_FILES([  
+  buildtools/Makefile
   testsuite/Makefile
   testsuite/run_tests    
 ],[