From fc13ef96a19669e298a992e64a0ef100ef6b9225 Mon Sep 17 00:00:00 2001 From: Joerg Wunsch Date: Wed, 11 May 2011 21:24:12 +0000 Subject: [PATCH] Remove the version checks for autoconf and automake. Modern versions no longer experience the day-to-day incompatibilities we've been faced with some 5+ years ago. git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@960 81a1dc3b-b13d-400b-aceb-764788c761c2 --- bootstrap | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/bootstrap b/bootstrap index cacf4434..9dd39f15 100755 --- a/bootstrap +++ b/bootstrap @@ -1,35 +1,10 @@ #! /bin/sh -# autoconf-2.59 or 2.61, 2.62 is known to work - : ${AUTOHEADER="autoheader${AC_VER}"} : ${AUTOCONF="autoconf${AC_VER}"} - -# automake-1.9.x or 1.10 is known to work - : ${ACLOCAL="aclocal${AM_VER}"} : ${AUTOMAKE="automake${AM_VER}"} -# Verify autoconf version - -AUTOCONF_VER=`(${AUTOCONF} --version 2>/dev/null | head -n 1 | \ - cut -d ' ' -f 4) 2>/dev/null` -if [ "$AUTOCONF_VER" != "2.59" -a "$AUTOCONF_VER" != "2.61" -a "$AUTOCONF_VER" != "2.62" ] -then - echo "Warning: This program is tested with autoconf version 2.59, 2.61 and 2.62." - echo "You are using `${AUTOCONF} --version | head -n 1`." -fi - -# Verify automake version - -AUTOMAKE_VER=`(${AUTOMAKE} --version | head -n 1 | \ - cut -d ' ' -f 4 | cut -d '.' -f -2) 2>/dev/null` -if [ "$AUTOMAKE_VER" != "1.9" -a "$AUTOMAKE_VER" != "1.10" ] -then - echo "Warning: This program is tested with automake version 1.9 and 1.10." - echo "You are using `${AUTOMAKE} --version | head -n 1`." -fi - export ACLOCAL AUTOHEADER AUTOCONF AUTOMAKE # Bootstrap the build system.