PatchSet 7706 Date: 2008/01/20 18:15:29 Author: robilad Branch: HEAD Tag: (none) Log: removed version checking logic from autogen.sh
2008-01-20 Dalibor Topic <[EMAIL PROTECTED]> * developers/autogen.sh: Removed version checking logic. We should simply set the minimum versions necessary in configure.ac. Members: ChangeLog:1.5207->1.5208 developers/autogen.sh:1.81->1.82 Index: kaffe/ChangeLog diff -u kaffe/ChangeLog:1.5207 kaffe/ChangeLog:1.5208 --- kaffe/ChangeLog:1.5207 Sun Jan 20 18:10:34 2008 +++ kaffe/ChangeLog Sun Jan 20 18:15:29 2008 @@ -1,5 +1,10 @@ 2008-01-20 Dalibor Topic <[EMAIL PROTECTED]> + * developers/autogen.sh: Removed version checking logic. + We should simply set the minimum versions necessary in configure.ac. + +2008-01-20 Dalibor Topic <[EMAIL PROTECTED]> + * m4/libtool.m4: Removed. 2008-01-20 Dalibor Topic <[EMAIL PROTECTED]> Index: kaffe/developers/autogen.sh diff -u kaffe/developers/autogen.sh:1.81 kaffe/developers/autogen.sh:1.82 --- kaffe/developers/autogen.sh:1.81 Sun Jan 20 17:55:36 2008 +++ kaffe/developers/autogen.sh Sun Jan 20 18:15:31 2008 @@ -1,94 +1,5 @@ #! /bin/sh -set -e - -# This script runs all of the various auto* programs in the correct order. -# You should run this from the top-level directory. -# Written by Mo DeJong. - -export LC_ALL=C - -# Check for versions of various tools to use when regenerating -# Makefiles and configure scripts - if you want to use different -# versions, use --override. The purpose of these checks is to just -# make sure that people are using consistent versions of tools -# when checking into CVS so we have predictable regression. - -if [ "$1" != "--override" ]; then - -WANTED_AUTOMAKE_VERS="1.10" -WANTED_AUTOCONF_VERS="2.61" -WANTED_LIBTOOL_VERS="1.5.24" -WANTED_AUTOPOINT_VERS="0.16.1" - -ACLOCAL_VERS=`aclocal --version | - sed -n 's,^aclocal (GNU automake) \(.*\)$,\1,p'` -if [ "$ACLOCAL_VERS" != "$WANTED_AUTOMAKE_VERS" ]; then - echo "Missing or wrong version for aclocal (from automake)." - echo "We want automake $WANTED_AUTOMAKE_VERS" - if [ -n "$ACLOCAL_VERS" ]; then - echo "We found aclocal from automake $ACLOCAL_VERS" - fi - exit 1 -fi - -AUTOHEADER_VERS=`autoheader --version | - sed -n 's,^autoheader (GNU Autoconf) \(.*\)$,\1,p'` -if [ "$AUTOHEADER_VERS" != "$WANTED_AUTOCONF_VERS" ]; then - echo "Missing or wrong version for autoheader (from autoconf)." - echo "We want autoconf $WANTED_AUTOCONF_VERS" - if [ -n "$AUTOHEADER_VERS" ]; then - echo "We found autoheader from autoconf $AUTOHEADER_VERS" - fi - exit 1 -fi - -AUTOMAKE_VERS=`automake --version | - sed -n 's,^automake (GNU automake) \(.*\)$,\1,p'` -if [ "$AUTOMAKE_VERS" != "$WANTED_AUTOMAKE_VERS" ]; then - echo "Missing or wrong version for automake." - echo "We want automake $WANTED_AUTOMAKE_VERS" - if [ -n "$AUTOMAKE_VERS" ]; then - echo "We found automake $AUTOMAKE_VERS" - fi - exit 1 -fi - -AUTOCONF_VERS=`autoconf --version | - sed -n 's,^autoconf (GNU Autoconf) \(.*\)$,\1,p'` -if [ "$AUTOCONF_VERS" != "$WANTED_AUTOCONF_VERS" ]; then - echo "Missing or wrong version for autoconf." - echo "We want autoconf $WANTED_AUTOCONF_VERS" - if [ -n "$AUTOCONF_VERS" ]; then - echo "We found autoconf $AUTOCONF_VERS" - fi - exit 1 -fi - -LIBTOOLIZE_VERS=`libtoolize --version | - sed -n 's,^libtoolize (GNU libtool) \(.*\)$,\1,p'` -if [ "$LIBTOOLIZE_VERS" != "$WANTED_LIBTOOL_VERS" ]; then - echo "Missing or wrong version for libtoolize (from libtool)." - echo "We want libtool $WANTED_LIBTOOL_VERS" - if [ -n "$LIBTOOLIZE_VERS" ]; then - echo "We found libtoolize from libtool $LIBTOOLIZE_VERS" - fi - exit 1 -fi - -AUTOPOINT_VERS=`gettext --version | - sed -n 's,^gettext (GNU gettext-runtime) \(.*\)$,\1,p'` -if [ "$AUTOPOINT_VERS" != "$WANTED_AUTOPOINT_VERS" ]; then - echo "Missing or wrong version for autopoint (from gettext)." - echo "We want autopoint $WANTED_AUTOPOINT_VERS" - if [ -n "$AUTOPOINT_VERS" ]; then - echo "We found autopoint from gettext $AUTOPOINT_VERS" - fi - exit 1 -fi - -fi - autoreconf -f -i # -Wall # drops specific patches _______________________________________________ kaffe mailing list kaffe@kaffe.org http://kaffe.org/cgi-bin/mailman/listinfo/kaffe