diff options
author | Misha Brukman <brukman+llvm@gmail.com> | 2009-08-13 20:29:30 +0000 |
---|---|---|
committer | Misha Brukman <brukman+llvm@gmail.com> | 2009-08-13 20:29:30 +0000 |
commit | a24b4dde3ad4699af1d694378389647543ab89a0 (patch) | |
tree | c179c0c844508cb0dac89adad24a20d70263bfc5 /autoconf | |
parent | 7dc75a60ce5ef132e3fae4c285f7e596281ff593 (diff) | |
download | external_llvm-a24b4dde3ad4699af1d694378389647543ab89a0.zip external_llvm-a24b4dde3ad4699af1d694378389647543ab89a0.tar.gz external_llvm-a24b4dde3ad4699af1d694378389647543ab89a0.tar.bz2 |
* Moved all tool version requirements to the same place
* Cleaned up multiple uses of literal version numbers and simplified 'cleaning'
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@78932 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'autoconf')
-rwxr-xr-x | autoconf/AutoRegen.sh | 36 |
1 files changed, 22 insertions, 14 deletions
diff --git a/autoconf/AutoRegen.sh b/autoconf/AutoRegen.sh index 5f5f2db..07866e6 100755 --- a/autoconf/AutoRegen.sh +++ b/autoconf/AutoRegen.sh @@ -1,33 +1,41 @@ -#!/bin/sh -die () { +#!/bin/bash + +die() { echo "$@" 1>&2 exit 1 } -### NOTE: ############################################################" -### The below two variables specify the auto* versions -### periods should be escaped with backslash, for use by grep +clean() { + echo $1 | sed -e 's/\\//g' +} + +### NOTE: ############################################################ +### These variables specify the tool versions we want to use. +### Periods should be escaped with backslash for use by grep. want_autoconf_version='2\.60' want_autoheader_version=$want_autoconf_version -### END NOTE #########################################################" - +want_aclocal_version='1\.9\.6' +want_libtool_version='1\.5\.22' +### END NOTE ######################################################### outfile=configure configfile=configure.ac -want_autoconf_version_clean=`echo $want_autoconf_version | sed -e 's/\\\\//g'` -want_autoheader_version_clean=`echo $want_autoheader_version | sed -e 's/\\\\//g'` +want_autoconf_version_clean=$(clean $want_autoconf_version) +want_autoheader_version_clean=$(clean $want_autoheader_version) +want_aclocal_version_clean=$(clean $want_aclocal_version) +want_libtool_version_clean=$(clean $want_libtool_version) test -d autoconf && test -f autoconf/$configfile && cd autoconf test -f $configfile || die "Can't find 'autoconf' dir; please cd into it first" autoconf --version | grep $want_autoconf_version > /dev/null test $? -eq 0 || die "Your autoconf was not detected as being $want_autoconf_version_clean" -aclocal --version | grep '^aclocal.*1\.9\.6' > /dev/null -test $? -eq 0 || die "Your aclocal was not detected as being 1.9.6" +aclocal --version | grep '^aclocal.*'$want_aclocal_version > /dev/null +test $? -eq 0 || die "Your aclocal was not detected as being $want_aclocal_version_clean" autoheader --version | grep '^autoheader.*'$want_autoheader_version > /dev/null test $? -eq 0 || die "Your autoheader was not detected as being $want_autoheader_version_clean" -libtool --version | grep '1\.5\.22' > /dev/null -test $? -eq 0 || die "Your libtool was not detected as being 1.5.22" +libtool --version | grep $want_libtool_version > /dev/null +test $? -eq 0 || die "Your libtool was not detected as being $want_libtool_version_clean" echo "" echo "### NOTE: ############################################################" echo "### If you get *any* warnings from autoconf below you MUST fix the" @@ -37,7 +45,7 @@ echo "### commit any configure script that was generated with warnings" echo "### present. You should get just three 'Regenerating..' lines." echo "######################################################################" echo "" -echo "Regenerating aclocal.m4 with aclocal 1.9.6" +echo "Regenerating aclocal.m4 with aclocal $want_aclocal_version_clean" cwd=`pwd` aclocal --force -I $cwd/m4 || die "aclocal failed" echo "Regenerating configure with autoconf $want_autoconf_version_clean" |