updated bootstrap to deal with RH7.3

fix configure.ac for automake-1.5

git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/trunk@176 cb58f699-b61c-0410-a6fe-9272a202ed29

diff --git a/bootstrap b/bootstrap
index 4d68c0e..6a97012 100755 (executable)
--- 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.5
+aclocal="$program"
+find_program autoheader 2.53
+autoheader="$program"
+find_program automake 1.5
+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

diff --git a/configure.ac b/configure.ac
index f337662..012dc0f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl $Id$
 AC_PREREQ([2.50])
 AC_INIT([shibboleth], [0.1], [mace-shib-users@internet2.edu], [shibboleth])
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE(shibboleth, 0.1)
 
 sinclude(acx_pthread.m4)
 sinclude(acx_rpctest.m4)