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

[Dylan Noblesmith]

Author: nobled
Date: Wed Feb  1 18:17:33 2012
New Revision: 149568

URL: http://llvm.org/viewvc/llvm-project?rev=149568&view=rev
Log:
autoconf: restore old clang-srcdir behavior

Keep the string empty when unspecified. Undoes
part of r149563.


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=149568&r1=149567&r2=149568&view=diff
==============================================================================
--- llvm/trunk/autoconf/configure.ac (original)
+++ llvm/trunk/autoconf/configure.ac Wed Feb  1 18:17:33 2012
@@ -813,7 +813,7 @@
     [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 @@
 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])