From 8d6dd0f807da25caa65b569daf2716a9fb47804d Mon Sep 17 00:00:00 2001 From: Dylan Noblesmith Date: Thu, 2 Feb 2012 00:11:14 +0000 Subject: [PATCH] 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. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@149563 91177308-0d34-0410-b5e6-96231b3b80d8 --- autoconf/configure.ac | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/autoconf/configure.ac b/autoconf/configure.ac index 84a120b4f09..ad44a630ac0 100644 --- a/autoconf/configure.ac +++ b/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="" ;; + -) 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 @@ dnl Configure doxygen's configuration file 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