projects/sample: Import adapted form of current LLVM autoconf/Makefile setup so that...

[oota-llvm.git] / projects / sample / autoconf / AutoRegen.sh

diff --git a/projects/sample/autoconf/AutoRegen.sh b/projects/sample/autoconf/AutoRegen.sh
index 7c04715cdf444a0cc7281a6fad909ea52516f55d..b91b3e446a13ee39a3a717966e394b544308139c 100755 (executable)
--- a/projects/sample/autoconf/AutoRegen.sh
+++ b/projects/sample/autoconf/AutoRegen.sh
@@ -5,20 +5,18 @@ 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
   cd ../../../autoconf/m4
-  llvm_m4=`pwd`
-  llvm_src_root=../../..
-  llvm_obj_root=../../..
+  llvm_src_root=../..
+  llvm_obj_root=../..
   cd $cwd
 elif test -d ../../llvm/autoconf/m4 ; then
   cd ../../llvm/autoconf/m4
-  llvm_m4=`pwd`
   llvm_src_root=../..
   llvm_obj_root=../..
   cd $cwd
@@ -28,7 +26,6 @@ else
     read -p "Enter full path to LLVM source:" REPLY
     if test -d "$REPLY/autoconf/m4" ; then
       llvm_src_root="$REPLY"
-      llvm_m4="$REPLY/autoconf/m4"
       read -p "Enter full path to LLVM objects (empty for same as source):" REPLY
       if test -d "$REPLY" ; then
         llvm_obj_root="$REPLY"
@@ -39,14 +36,10 @@ else
     fi
   done
 fi
-# Patch the LLVM_ROOT in configure.ac, if it needs it
-cp configure.ac configure.bak
-sed -e "s#^LLVM_SRC_ROOT=.*#LLVM_SRC_ROOT=\"$llvm_src_root\"#" \
-    -e "s#^LLVM_OBJ_ROOT=.*#LLVM_OBJ_ROOT=\"$llvm_obj_root\"#" configure.bak > configure.ac
 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"
+aclocal -I $cwd/m4 || die "aclocal failed"
+echo "Regenerating configure with autoconf"
 autoconf --warnings=all -o ../configure configure.ac || die "autoconf failed"
 cd ..
 exit 0