X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=bootstrap;h=1e4d21eafee78a85503d6a18429447078fa87d9c;hb=58c7b01c1c4c08d15e044391780e78b61289e851;hp=4d68c0eb2b580e6915a30e33615e902d6bc4dca3;hpb=61fd0a38e90ec2f2088972d53363c50884fa823b;p=shibboleth%2Fsp.git

diff --git a/bootstrap b/bootstrap
index 4d68c0e..1e4d21e 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,13 +1,34 @@
 #!/bin/sh
 
+find_program()
+{
+    prog="$1"
+    vers="$2"
+
+    if test `"$prog-$vers" --version | head -1 | grep -c "$vers"` != 0 ; then
+	program="$prog-$vers"
+    else
+	program="$prog"
+    fi
+}
+
+# Find appropriate versions of the auto tools
+find_program aclocal 1.9
+aclocal="$program"
+find_program autoheader 2.53
+autoheader="$program"
+find_program automake 1.9
+automake="$program"
+find_program autoconf 2.53
+autoconf="$program"
+
 set -x
 
 # Remove autoconf 2.5x's cache directory
 rm -rf autom4te*.cache
 
-aclocal -I .                            || exit 1
-autoheader                              || exit 1
+$aclocal -I .                            || exit 1
+$autoheader                              || exit 1
 # libtoolize --force --copy               || exit 1
-automake --foreign --add-missing --copy || exit 1
-autoconf                                || exit 1
-
+$automake --foreign --add-missing --copy || exit 1
+$autoconf                                || exit 1