fix broken file name.

[simgrid.git] / bootstrap

diff --git a/bootstrap b/bootstrap
index 8f48373..69b16cc 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -1,8 +1,34 @@
-#!/bin/sh -e
+#!/bin/sh
 # Run this to generate all the initial makefiles, etc.
 
-amver=1.9
+amversions="${amver:-1.10}"
 
+check_version()
+{
+    eval $2 --version 2>/dev/null | grep -i "$1.*$3" >/dev/null
+}
+
+find_version()
+{
+    tool=$1
+    found="NOT_FOUND"
+    shift
+    versions="$*"
+
+    for version in $versions ; do
+       if check_version $tool ${tool}${variant} $version; then
+           found="${version}"
+           echo ${version} >&2
+           break
+       fi
+    done
+    if [ "x$found" = "xNOT_FOUND" ]; then
+       found="-" 
+    fi
+    echo $found
+}
+
+amver=`find_version automake ${amversions}`
 
 lt=`which libtoolize`
 if [ "x$lt" = "x" ] ; then
@@ -10,16 +36,9 @@ if [ "x$lt" = "x" ] ; then
   exit 1
 fi
 
-if [ "x$lt" = "x./libtool" ] ; then
-  echo "The found libtool is the one in the current directory."
-  echo "Either your path is broken ('.' is before '/usr/bin') or the libtool package is not installed."
-  echo "Please fix the situation to proceed with a CVS checkout"
-  exit 1
-fi
-
 am=`which automake-$amver`
 if [ "x$am" = "x" ] ; then
-  echo "automake version $amver 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 CVS checkout"
   exit 1
 fi
 
@@ -29,7 +48,7 @@ if [ "x$ac" = "x" ] ; then
   exit 1
 fi
 
-
+set -e
 # AUTOCONF=
 # AUTOHEADER=
 # AUTOPOINT=