* Fix an output message
* Make aclocal look in LLVM's autoconf/m4 directory for macros
* Don't force generation of missing files
llvm-svn: 20307
diff --git a/llvm/projects/sample/autoconf/AutoRegen.sh b/llvm/projects/sample/autoconf/AutoRegen.sh
index 2655f21..af6c0a4 100755
--- a/llvm/projects/sample/autoconf/AutoRegen.sh
+++ b/llvm/projects/sample/autoconf/AutoRegen.sh
@@ -19,12 +19,12 @@
llvm_m4=`pwd`
cd $cwd
else
- die "Can't find the LLVM autoconf/m4 directory. llvm-test should be checked out to projects directory"
+ die "Can't find the LLVM autoconf/m4 directory. The project should be checked out to projects directory"
fi
echo "Regenerating aclocal.m4 with aclocal"
rm -f aclocal.m4
-aclocal -I $cwd/m4 -I $llvm_m4 || die "aclocal failed"
+aclocal -I $llvm_m4 -I "$llvm_m4/.." || die "aclocal failed"
echo "Regenerating configure with autoconf 2.5x"
-autoconf --force --warnings=all -o ../configure configure.ac || die "autoconf failed"
+autoconf --warnings=all -o ../configure configure.ac || die "autoconf failed"
cd ..
exit 0