[llvm-commits] [release_19] CVS: llvm-poolalloc/autoconf/AutoRegen.sh configure.ac

[John Criswell]

Changes in directory llvm-poolalloc/autoconf:

AutoRegen.sh updated: 1.1.2.2 -> 1.1.2.3
configure.ac updated: 1.10.2.1 -> 1.10.2.2
---
Log message:

Fix configuration when srcdir != objdir.



---
Diffs of the changes:  (+4 -3)

 AutoRegen.sh |    4 ++--
 configure.ac |    3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)


Index: llvm-poolalloc/autoconf/AutoRegen.sh
diff -u llvm-poolalloc/autoconf/AutoRegen.sh:1.1.2.2 llvm-poolalloc/autoconf/AutoRegen.sh:1.1.2.3
--- llvm-poolalloc/autoconf/AutoRegen.sh:1.1.2.2	Wed Dec 13 15:56:38 2006
+++ llvm-poolalloc/autoconf/AutoRegen.sh	Wed Dec 13 17:22:45 2006
@@ -41,8 +41,8 @@
 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
+#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"


Index: llvm-poolalloc/autoconf/configure.ac
diff -u llvm-poolalloc/autoconf/configure.ac:1.10.2.1 llvm-poolalloc/autoconf/configure.ac:1.10.2.2
--- llvm-poolalloc/autoconf/configure.ac:1.10.2.1	Wed Dec 13 15:56:38 2006
+++ llvm-poolalloc/autoconf/configure.ac	Wed Dec 13 17:22:45 2006
@@ -4,8 +4,9 @@
 AC_INIT([[[Pool Allocation]]],[[[1.0]]],[llvmbugs at cs.uiuc.edu])
 
 dnl Identify where LLVM source tree is
-LLVM_SRC_ROOT="`(cd ../..; pwd)`"
+LLVM_SRC_ROOT="`(cd $srcdir/../..; pwd)`"
 LLVM_OBJ_ROOT="`(cd ../..; pwd)`"
+
 dnl Tell autoconf that the auxilliary files are actually located in
 dnl the LLVM autoconf directory, not here.
 AC_CONFIG_AUX_DIR($LLVM_SRC_ROOT/autoconf)