Fix paths; AutoRegen.sh changes its current working directory to be the

autoconf directory, but these paths need to be relative to the main
source directory.  Patch originally by Dan Gohman, r67655.

Also, cause configure.ac to find absolute paths to LLVM source and
object trees.   Together, fixes PR1220.

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

diff --git a/projects/sample/autoconf/AutoRegen.sh b/projects/sample/autoconf/AutoRegen.sh
index 126703ba5aaf10667a0b66cd7d671ed1aee0f99e..6e6931c7a9bc1e8ac3fb3560efe714aa0fb86fa5 100755 (executable)
--- a/projects/sample/autoconf/AutoRegen.sh
+++ b/projects/sample/autoconf/AutoRegen.sh
@@ -13,14 +13,14 @@ 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=../..
+  llvm_src_root=..
+  llvm_obj_root=..
   cd $cwd
 else
   while true ; do

diff --git a/projects/sample/autoconf/configure.ac b/projects/sample/autoconf/configure.ac
index 221dcc45edc0df7f657ce272838d896e8773104a..4e61bee5e7904991a9525d30ae388aa2436dfc00 100644 (file)
--- a/projects/sample/autoconf/configure.ac
+++ b/projects/sample/autoconf/configure.ac
@@ -4,12 +4,16 @@ dnl **************************************************************************
 AC_INIT([[[SAMPLE]]],[[[x.xx]]],[bugs@yourdomain])
 
 dnl Identify where LLVM source tree is
-LLVM_SRC_ROOT="../../"
-LLVM_OBJ_ROOT="../../"
+LLVM_SRC_ROOT="../.."
+LLVM_OBJ_ROOT="../.."
+
+dnl Find absolute paths to LLVM source and object trees
+LLVM_ABS_SRC_ROOT="`cd $srcdir ; cd $LLVM_SRC_ROOT ; pwd`"
+LLVM_ABS_OBJ_ROOT="`cd $LLVM_OBJ_ROOT ; pwd`"
 
 dnl Tell autoconf that this is an LLVM project being configured
 dnl This provides the --with-llvmsrc and --with-llvmobj options
-LLVM_CONFIG_PROJECT($LLVM_SRC_ROOT,$LLVM_OBJ_ROOT)
+LLVM_CONFIG_PROJECT($LLVM_ABS_SRC_ROOT,$LLVM_ABS_OBJ_ROOT)
 
 dnl Tell autoconf that the auxilliary files are actually located in
 dnl the LLVM autoconf directory, not here.