diff --git a/projects/sample/autoconf/AutoRegen.sh b/projects/sample/autoconf/AutoRegen.sh index 7c04715cdf4..126703ba5aa 100755 --- a/projects/sample/autoconf/AutoRegen.sh +++ b/projects/sample/autoconf/AutoRegen.sh @@ -5,9 +5,9 @@ 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" -autoconf --version | egrep '2\.5[0-9]' > /dev/null +autoconf --version | egrep '2\.[56][0-9]' > /dev/null if test $? -ne 0 ; then - die "Your autoconf was not detected as being 2.5x" + die "Your autoconf was not detected as being 2.5x or 2.6x" fi cwd=`pwd` if test -d ../../../autoconf/m4 ; then @@ -46,7 +46,7 @@ sed -e "s#^LLVM_SRC_ROOT=.*#LLVM_SRC_ROOT=\"$llvm_src_root\"#" \ echo "Regenerating aclocal.m4 with aclocal" rm -f aclocal.m4 aclocal -I $llvm_m4 -I "$llvm_m4/.." || die "aclocal failed" -echo "Regenerating configure with autoconf 2.5x" +echo "Regenerating configure with autoconf" autoconf --warnings=all -o ../configure configure.ac || die "autoconf failed" cd .. exit 0