[llvm-commits] [llvm] r149567 - /llvm/trunk/configure

[Eric Christopher]

Author: echristo
Date: Wed Feb  1 18:16:55 2012
New Revision: 149567

URL: http://llvm.org/viewvc/llvm-project?rev=149567&view=rev
Log:
Regenerate configure.

Modified:
    llvm/trunk/configure

Modified: llvm/trunk/configure
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/configure?rev=149567&r1=149566&r2=149567&view=diff
==============================================================================
--- llvm/trunk/configure (original)
+++ llvm/trunk/configure Wed Feb  1 18:16:55 2012
@@ -5535,7 +5535,7 @@
 fi
 
 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
@@ -21094,9 +21094,11 @@
 
 ac_config_files="$ac_config_files docs/doxygen.cfg"
 
-if test -f ${srcdir}/tools/clang/README.txt; then
-  ac_config_headers="$ac_config_headers tools/clang/include/clang/Config/config.h"
-  ac_config_files="$ac_config_files tools/clang/docs/doxygen.cfg"
+
+if test -f ${clang_src_root}/README.txt; then
+  ac_config_headers="$ac_config_headers ${clang_src_root}/include/clang/Config/config.h"
+
+  ac_config_files="$ac_config_files ${clang_src_root}/docs/doxygen.cfg"
 
 fi
 
@@ -21718,7 +21720,8 @@
     "Makefile.config") CONFIG_FILES="$CONFIG_FILES Makefile.config" ;;
     "llvm.spec") CONFIG_FILES="$CONFIG_FILES llvm.spec" ;;
     "docs/doxygen.cfg") CONFIG_FILES="$CONFIG_FILES docs/doxygen.cfg" ;;
-    "tools/clang/docs/doxygen.cfg") CONFIG_FILES="$CONFIG_FILES tools/clang/docs/doxygen.cfg" ;;
+    "${clang_src_root}/include/clang/Config/config.h") CONFIG_HEADERS="$CONFIG_HEADERS ${clang_src_root}/include/clang/Config/config.h" ;;
+    "${clang_src_root}/docs/doxygen.cfg") CONFIG_FILES="$CONFIG_FILES ${clang_src_root}/docs/doxygen.cfg" ;;
     "bindings/ocaml/llvm/META.llvm") CONFIG_FILES="$CONFIG_FILES bindings/ocaml/llvm/META.llvm" ;;
     "setup") CONFIG_COMMANDS="$CONFIG_COMMANDS setup" ;;
     "Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile" ;;