[llvm-commits] [llvm] r121645 - in /llvm/trunk/projects/sample/autoconf: AutoRegen.sh configure.ac

[Peter Collingbourne]

Author: pcc
Date: Sun Dec 12 15:41:56 2010
New Revision: 121645

URL: http://llvm.org/viewvc/llvm-project?rev=121645&view=rev
Log:
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.

Modified:
    llvm/trunk/projects/sample/autoconf/AutoRegen.sh
    llvm/trunk/projects/sample/autoconf/configure.ac

Modified: llvm/trunk/projects/sample/autoconf/AutoRegen.sh
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/projects/sample/autoconf/AutoRegen.sh?rev=121645&r1=121644&r2=121645&view=diff
==============================================================================
--- llvm/trunk/projects/sample/autoconf/AutoRegen.sh (original)
+++ llvm/trunk/projects/sample/autoconf/AutoRegen.sh Sun Dec 12 15:41:56 2010
@@ -13,14 +13,14 @@
 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

Modified: llvm/trunk/projects/sample/autoconf/configure.ac
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/projects/sample/autoconf/configure.ac?rev=121645&r1=121644&r2=121645&view=diff
==============================================================================
--- llvm/trunk/projects/sample/autoconf/configure.ac (original)
+++ llvm/trunk/projects/sample/autoconf/configure.ac Sun Dec 12 15:41:56 2010
@@ -4,12 +4,16 @@
 AC_INIT([[[SAMPLE]]],[[[x.xx]]],[bugs at 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.