Add entries about GTNetS and alternate flow models.

[simgrid.git] / bootstrap

diff --git a/bootstrap b/bootstrap
index faaf3c4..af6ab36 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -9,6 +9,12 @@
 
 amversions="${amver:-1.10}"
 
+if [ ! -e bootstrap ] ; then
+  if [ -e ../bootstrap ] ; then
+    cd ..
+  fi
+fi
+
 check_version()
 {
     eval $2 --version 2>/dev/null | grep -i "$1.*$3" >/dev/null
@@ -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