diff options
| author | Dylan Noblesmith <nobled@dreamwidth.org> | 2012-02-02 00:17:33 +0000 |
|---|---|---|
| committer | Dylan Noblesmith <nobled@dreamwidth.org> | 2012-02-02 00:17:33 +0000 |
| commit | db6caea4f836ec0a635113a742b71705d6587dd4 (patch) | |
| tree | 17d047d2bbd18a7452c6b8e63914d2e04658bdd1 /autoconf | |
| parent | 63c095199939bfa2711346a6394c5d9171b31f15 (diff) | |
| download | llvm-db6caea4f836ec0a635113a742b71705d6587dd4.tar.gz llvm-db6caea4f836ec0a635113a742b71705d6587dd4.tar.bz2 llvm-db6caea4f836ec0a635113a742b71705d6587dd4.tar.xz | |
autoconf: restore old clang-srcdir behavior
Keep the string empty when unspecified. Undoes
part of r149563.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@149568 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'autoconf')
| -rw-r--r-- | autoconf/configure.ac | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/autoconf/configure.ac b/autoconf/configure.ac index ad44a630ac..c9757d9ff7 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="$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]) |