X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e1c190397d9e2c31a34db0ca8891dc23eeba5e2d..d74e6d6c2620eab29f73b3ab540c4a60ea8592fa:/bootstrap

diff --git a/bootstrap b/bootstrap
index faaf3c4155..1e86b571cf 100755
--- a/bootstrap
+++ b/bootstrap
@@ -7,7 +7,13 @@
 # You can redistribute and/or modify it under the terms of the
 # GNU LGPL (v2.1) licence.
 
-amversions="${amver:-1.10}"
+amversions="1.10 1.11"
+
+if [ ! -e bootstrap ] ; then
+  if [ -e ../bootstrap ] ; then
+    cd ..
+  fi
+fi
 
 check_version()
 {
@@ -38,19 +44,19 @@ amver=`find_version automake ${amversions}`
 
 lt=`which libtoolize`
 if [ "x$lt" = "x" ] ; then
-  echo "Libtool not found. Please install the libtool package to proceed with a CVS checkout"
+  echo "Libtool not found. Please install the libtool package to proceed with a SVN checkout"
   exit 1
 fi
 
 am=`which automake-$amver`
 if [ "x$am" = "x" ] ; then
-  echo "automake versions $amversions not found. Please install the relevant package to proceed with a CVS checkout"
+  echo "automake versions $amversions not found. Please install the relevant package to proceed with a SVN checkout"
   exit 1
 fi
 
 ac=`which autoconf`
 if [ "x$ac" = "x" ] ; then
-  echo "autoconf not found. Please install the relevant package to proceed with a CVS checkout"
+  echo "autoconf not found. Please install the relevant package to proceed with a SVN checkout"
   exit 1
 fi
 
@@ -75,7 +81,7 @@ echo "----------------------------------"
 
 echo 
 echo "Most common flags:"
-echo "  --enable-maintainer-mode         mandatory if you use the CVS version"
+echo "  --enable-maintainer-mode         mandatory if you use the SVN version"
 echo "  --disable-compile-optimizations  useful if your gdb gets fooled"
 echo