From f56decd00234ab37bb5101cc465c98e41de19ce9 Mon Sep 17 00:00:00 2001
From: Daniel Dunbar <daniel@zuster.org>
Date: Fri, 12 Sep 2014 13:10:37 -0700
Subject: Revert "Patch by Dan Liew: "Improved AutoRegen script so that it
 supports newer versions of autoconf""

The entire point of this version check in this script is so that configure is
only generated with one exact version of autotools, so that it doesn't get
spurious diffs from people generating it with different versions. This is the
approach used by LLVM, and I'd like to stick to it. Most people don't regenerate
these files, so it falls on the people who do to install the appropriate
versions of the tools.

If we want to change this policy, we should just drop the version checks completely.
---
 autoconf/AutoRegen.sh | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

(limited to 'autoconf')

diff --git a/autoconf/AutoRegen.sh b/autoconf/AutoRegen.sh
index 8fed1141..4a34f8c0 100755
--- a/autoconf/AutoRegen.sh
+++ b/autoconf/AutoRegen.sh
@@ -15,41 +15,27 @@ die () {
 }
 test -d autoconf && test -f autoconf/configure.ac && cd autoconf
 test -f configure.ac || die "Can't find 'autoconf' dir; please cd into it first"
-
-#grab autoconf version from the first line of autoconf output
-ac_version=`autoconf --version | sed -n 1p`
-
-echo "$ac_version" | egrep '2\.6[0-9]' > /dev/null
+autoconf --version | egrep '2\.60' > /dev/null
 if test $? -ne 0 ; then
-  die "Your autoconf was not detected as being 2.6[0-9]. Reported version $ac_version"
+  die "Your autoconf was not detected as being 2.60"
 fi
-
 # Patch LLVM_SRC_ROOT in configure.ac
 sed -e "s#^LLVM_SRC_ROOT=.*#LLVM_SRC_ROOT=\"$llvm_src_root\"#" \
     configure.ac > configure.tmp.ac
-
 echo "Regenerating aclocal.m4 with aclocal"
 rm -f aclocal.m4
 echo aclocal -I $llvm_m4 -I "$llvm_m4/.." || die "aclocal failed"
 aclocal -I $llvm_m4 -I "$llvm_m4/.." || die "aclocal failed"
-
-# Run autoconf
-echo "Regenerating configure with $ac_version"
+echo "Regenerating configure with autoconf 2.60"
 echo autoconf --warnings=all -o ../configure configure.tmp.ac || die "autoconf failed"
 autoconf --warnings=all -o ../configure configure.tmp.ac || die "autoconf failed"
 cp ../configure ../configure.bak
-
-#patch final configure file
 sed -e "s#^LLVM_SRC_ROOT=.*#LLVM_SRC_ROOT=\".\"#" \
     ../configure.bak > ../configure
 cd ..
-
-#Generate header
 echo "Regenerating config.h.in with autoheader"
 autoheader --warnings=all \
     -I autoconf -I autoconf/m4 \
     autoconf/configure.tmp.ac || die "autoheader failed"
-
-#clean up
 rm -f autoconf/configure.tmp.ac configure.bak
 exit 0
-- 
cgit 1.4.1