summaryrefslogtreecommitdiffstats
path: root/llvm/autoconf/configure.ac
diff options
context:
space:
mode:
authorDylan Noblesmith <nobled@dreamwidth.org>2012-02-02 00:17:33 +0000
committerDylan Noblesmith <nobled@dreamwidth.org>2012-02-02 00:17:33 +0000
commitb5190ab2643e0c19862327645537bc63995771a8 (patch)
tree66fb9235a6749829bdff7743bca744dfde702088 /llvm/autoconf/configure.ac
parentf1329897b1c77cc24d6798f42aa25584e4e8db0f (diff)
downloadbcm5719-llvm-b5190ab2643e0c19862327645537bc63995771a8.tar.gz
bcm5719-llvm-b5190ab2643e0c19862327645537bc63995771a8.zip
autoconf: restore old clang-srcdir behavior
Keep the string empty when unspecified. Undoes part of r149563. llvm-svn: 149568
Diffstat (limited to 'llvm/autoconf/configure.ac')
-rw-r--r--llvm/autoconf/configure.ac5
1 files changed, 4 insertions, 1 deletions
diff --git a/llvm/autoconf/configure.ac b/llvm/autoconf/configure.ac
index ad44a630ac0..c9757d9ff7b 100644
--- a/llvm/autoconf/configure.ac
+++ b/llvm/autoconf/configure.ac
@@ -813,7 +813,7 @@ AC_ARG_WITH(clang-srcdir,
[Directory to the out-of-tree Clang source]),,
withval="-")
case "$withval" in
- -) clang_src_root="$ac_pwd/tools/clang" ;;
+ -) clang_src_root="" ;;
/* | [[A-Za-z]]:[[\\/]]*) clang_src_root="$withval" ;;
*) clang_src_root="$ac_pwd/$withval" ;;
esac
@@ -1588,6 +1588,9 @@ dnl Configure doxygen's configuration file
AC_CONFIG_FILES([docs/doxygen.cfg])
dnl Configure clang, if present
+if test ${clang_src_root} = ""; then
+ clang_src_root="$ac_pwd/tools/clang"
+fi
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])
OpenPOWER on IntegriCloud