2002-11-07 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* bootstrap: Allow autoconf > 2.52, automake > 1.6.
This commit is contained in:
Ralf Corsepius
2002-11-07 16:29:56 +00:00
parent 3d4c7390de
commit 7395fa5e33
2 changed files with 8 additions and 6 deletions

View File

@@ -1,3 +1,7 @@
2002-11-07 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* bootstrap: Allow autoconf > 2.52, automake > 1.6.
2002-11-07 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2002-11-07 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Remove make/Templates/Makefile. * configure.ac: Remove make/Templates/Makefile.

View File

@@ -12,8 +12,8 @@
# to be run from the toplevel directory of RTEMS' # to be run from the toplevel directory of RTEMS'
# source tree # source tree
AUTOCONF_VERS=2.52 AUTOCONF_VERS=2\.5[2345]
AUTOMAKE_VERS=1.6.[123] AUTOMAKE_VERS=1\.[76]
progname=`basename $0` progname=`basename $0`
top_srcdir=`dirname $0` top_srcdir=`dirname $0`
@@ -99,8 +99,7 @@ generate)
if test -z "$AUTOCONF"; then if test -z "$AUTOCONF"; then
echo "You must have autoconf installed to run $program" echo "You must have autoconf installed to run $program"
fi fi
AUTOCONF_VER=`$AUTOCONF --version 2>/dev/null` if test -z "`$AUTOCONF --version 2>/dev/null | grep -e \" $AUTOCONF_VERS\"`"; then
if test -z "`echo $AUTOCONF_VER | grep \" $AUTOCONF_VERS\"`"; then
cat << EOF cat << EOF
RTEMS requires autoconf version $AUTOCONF_VERS. RTEMS requires autoconf version $AUTOCONF_VERS.
@@ -113,8 +112,7 @@ EOF
if test -z "$AUTOMAKE"; then if test -z "$AUTOMAKE"; then
echo "You must have automake installed to run $program" echo "You must have automake installed to run $program"
fi fi
AUTOMAKE_VER=`$AUTOMAKE --version 2>/dev/null` if test -z "`$AUTOMAKE --version 2>/dev/null | grep -e \" $AUTOMAKE_VERS\"`"; then
if test -z "`echo $AUTOMAKE_VER | grep \" $AUTOMAKE_VERS\"`"; then
cat << EOF cat << EOF
RTEMS requires automake version $AUTOMAKE_VERS. RTEMS requires automake version $AUTOMAKE_VERS.