From 0b22af60bb3fcea83e837c7b0fcfd2691d0ada56 Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Tue, 25 Mar 2003 08:50:16 +0000
Subject: Merger from rtems-4-6-branch.

---
 bootstrap | 47 +++++++++++++++++++++--------------------------
 1 file changed, 21 insertions(+), 26 deletions(-)

(limited to 'bootstrap')

diff --git a/bootstrap b/bootstrap
index 36787c4b98..0b60071b04 100755
--- a/bootstrap
+++ b/bootstrap
@@ -12,9 +12,6 @@
 # to be run from the toplevel directory of RTEMS'
 # source tree
 
-AUTOCONF_VERS=2\.57
-AUTOMAKE_VERS=1\.7\.2
-
 progname=`basename $0`
 top_srcdir=`dirname $0`
 
@@ -98,29 +95,27 @@ generate)
   AUTOCONF=${AUTOCONF-autoconf}
   if test -z "$AUTOCONF"; then
     echo "You must have autoconf installed to run $program"
+    exit 1
   fi
-  if test -z "`$AUTOCONF --version 2>/dev/null | grep -e \" $AUTOCONF_VERS\"`"; then
-cat << EOF
-RTEMS requires autoconf version $AUTOCONF_VERS.
-
-You are trying to use $AUTOCONF which does not seem to be sufficient
-EOF
-  exit 1
+  
+  AUTOHEADER=${AUTOHEADER-autoheader}
+  if test -z "$AUTOHEADER"; then
+    echo "You must have autoconf installed to run $program"
+    exit 1
   fi
   
   AUTOMAKE=${AUTOMAKE-automake}
   if test -z "$AUTOMAKE"; then
     echo "You must have automake installed to run $program"
-  fi
-  if test -z "`$AUTOMAKE --version 2>/dev/null | grep -e \" $AUTOMAKE_VERS\"`"; then
-cat << EOF
-RTEMS requires automake version $AUTOMAKE_VERS.
-
-You are trying to use $AUTOMAKE which does not seem to be sufficient
-EOF
-  exit 1
+    exit 1
   fi
   
+  ACLOCAL=${ACLOCAL-aclocal}
+  if test -z "$ACLOCAL"; then
+    echo "You must have automake installed to run $program"
+    exit 1
+  fi
+
   case $top_srcdir in
   /* ) aclocal_dir=$top_srcdir
     ;;
@@ -139,14 +134,14 @@ EOF
     pat="s,\$(RTEMS_TOPdir),${aclocal_dir},g"
     aclocal_args=`grep '^[ ]*ACLOCAL_AMFLAGS' Makefile.am | \
       sed -e 's%.*ACLOCAL_AMFLAGS.*\=[ ]*%%g' -e $pat ` ;
-    test "$verbose" = "-v" && echo "aclocal $aclocal_args"
-    aclocal $aclocal_args;
-    test -n "`grep CONFIG_HEADER ${configure}`" && autoheader \
-      && test "$verbose" = "-v" && echo "autoheader";
-    test -n "`grep RTEMS_BSP_CONFIGURE ${configure}`" && autoheader \
-      && test "$verbose" = "-v" && echo "autoheader";
-    test -f Makefile.am && automake -a -c $verbose ;
-    autoconf;
+    test "$verbose" = "-v" && echo "${ACLOCAL} $aclocal_args"
+    ${ACLOCAL} $aclocal_args;
+    test -n "`grep CONFIG_HEADER ${configure}`" && ${AUTOHEADER} \
+      && test "$verbose" = "-v" && echo "${AUTOHEADER}";
+    test -n "`grep RTEMS_BSP_CONFIGURE ${configure}`" && ${AUTOHEADER} \
+      && test "$verbose" = "-v" && echo "${AUTOHEADER}";
+    test -f Makefile.am && ${AUTOMAKE} -a -c $verbose ;
+    ${AUTOCONF};
     test -f Makefile.am && test -n "`grep 'stamp-h\.in' Makefile.in`" \
       && echo timestamp > stamp-h.in
   )
-- 
cgit v1.2.3