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

diff --git a/bootstrap b/bootstrap
index 185c9f17e8..1e86b571cf 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,7 +1,19 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.
 
-amversions="${amver:-1.10 1.9}"
+# Copyright (c) 2004-2007. The SimGrid team. All right reserved.
+
+# This file is part of the SimGrid project. This is free software:
+# You can redistribute and/or modify it under the terms of the
+# GNU LGPL (v2.1) licence.
+
+amversions="1.10 1.11"
+
+if [ ! -e bootstrap ] ; then
+  if [ -e ../bootstrap ] ; then
+    cd ..
+  fi
+fi
 
 check_version()
 {
@@ -15,7 +27,7 @@ find_version()
     shift
     versions="$*"
 
-    for version in $versions; do
+    for version in $versions ; do
 	if check_version $tool ${tool}${variant} $version; then
 	    found="${version}"
 	    echo ${version} >&2
@@ -32,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
 
@@ -69,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