* Fix an output message

* Make aclocal look in LLVM's autoconf/m4 directory for macros
* Don't force generation of missing files

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@20307 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/projects/sample/autoconf/AutoRegen.sh b/projects/sample/autoconf/AutoRegen.sh
index 2655f21dc01348a253adc1c84d2e81609546b2c0..af6c0a4b2889642777570f7979f9af9ebd41ff3b 100755 (executable)
--- a/projects/sample/autoconf/AutoRegen.sh
+++ b/projects/sample/autoconf/AutoRegen.sh
@@ -19,12 +19,12 @@ elif test -d ../../llvm/autoconf/m4 ; then
   llvm_m4=`pwd`
   cd $cwd
 else
   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
 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"
 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
 cd ..
 exit 0