summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReid Spencer <rspencer@reidspencer.com>2005-02-24 18:42:34 +0000
committerReid Spencer <rspencer@reidspencer.com>2005-02-24 18:42:34 +0000
commit07068a53ab6a8297fbf408f1037ad922cef6b126 (patch)
tree61430a027b2a6d22ab837434cd50fdf9176ea0ff
parent904650cdd032cb2f0a4da3d3c031dcf3f7d24627 (diff)
downloadbcm5719-llvm-07068a53ab6a8297fbf408f1037ad922cef6b126.tar.gz
bcm5719-llvm-07068a53ab6a8297fbf408f1037ad922cef6b126.zip
* 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
-rwxr-xr-xllvm/projects/sample/autoconf/AutoRegen.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/llvm/projects/sample/autoconf/AutoRegen.sh b/llvm/projects/sample/autoconf/AutoRegen.sh
index 2655f21dc01..af6c0a4b288 100755
--- a/llvm/projects/sample/autoconf/AutoRegen.sh
+++ b/llvm/projects/sample/autoconf/AutoRegen.sh
@@ -19,12 +19,12 @@ elif test -d ../../llvm/autoconf/m4 ; then
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
OpenPOWER on IntegriCloud