[llvm-commits] [llvm] r149563 - /llvm/trunk/autoconf/configure.ac

[Dylan Noblesmith]

Author: nobled
Date: Wed Feb  1 18:11:14 2012
New Revision: 149563

URL: http://llvm.org/viewvc/llvm-project?rev=149563&view=rev
Log:
autoconf: honor --with-clang-srcdir

configure was silently failing to produce anything in the case
where clang wasn't at tools/clang/, resulting in compilation
errors much later in the build when config.h didn't exist.


Modified:
    llvm/trunk/autoconf/configure.ac

Modified: llvm/trunk/autoconf/configure.ac
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/autoconf/configure.ac?rev=149563&r1=149562&r2=149563&view=diff
==============================================================================
--- llvm/trunk/autoconf/configure.ac (original)
+++ llvm/trunk/autoconf/configure.ac Wed Feb  1 18:11:14 2012
@@ -813,7 +813,7 @@
     [Directory to the out-of-tree Clang source]),,
     withval="-")
 case "$withval" in
-  -) clang_src_root="" ;;
+  -) clang_src_root="$ac_pwd/tools/clang" ;;
   /* | [[A-Za-z]]:[[\\/]]*) clang_src_root="$withval" ;;
   *) clang_src_root="$ac_pwd/$withval" ;;
 esac
@@ -1588,9 +1588,9 @@
 AC_CONFIG_FILES([docs/doxygen.cfg])
 
 dnl Configure clang, if present
-if test -f ${srcdir}/tools/clang/README.txt; then
-  AC_CONFIG_HEADERS([tools/clang/include/clang/Config/config.h])
-  AC_CONFIG_FILES([tools/clang/docs/doxygen.cfg])
+if test -f ${clang_src_root}/README.txt; then
+  AC_CONFIG_HEADERS([${clang_src_root}/include/clang/Config/config.h])
+  AC_CONFIG_FILES([${clang_src_root}/docs/doxygen.cfg])
 fi
 
 dnl OCaml findlib META file