From ab5fc1a2d95f9ad04781b40dc4661e8991881242 Mon Sep 17 00:00:00 2001
From: Logan Chien <tzuhsiang.chien@gmail.com>
Date: Thu, 12 Mar 2015 19:56:25 +0000
Subject: [PATCH] [autoconf] Fix the build failure by quoting the strings.

llvm-svn: 232090
---
 autoconf/configure.ac | 20 ++++++++++----------
 configure             | 20 ++++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index 19f7a2e20c8..4d70acdf80a 100644
--- a/autoconf/configure.ac
+++ b/autoconf/configure.ac
@@ -858,8 +858,8 @@ case "$ENABLE_DOXYGEN_SEARCH" in
       yes)
         AC_SUBST(enable_external_search,[YES])
         AC_SUBST(enable_server_based_search,[YES])
-        AC_SUBST(searchengine_url,[$WITH_DOXYGEN_SEARCH_ENGINE_URL])
-        AC_SUBST(extra_search_mappings,[$WITH_DOXYGEN_SEARCH_MAPPINGS])
+        AC_SUBST(searchengine_url,["$WITH_DOXYGEN_SEARCH_ENGINE_URL"])
+        AC_SUBST(extra_search_mappings,["$WITH_DOXYGEN_SEARCH_MAPPINGS"])
         ;;
 
       no|default)
@@ -901,17 +901,17 @@ case "$enableval" in
     AC_SUBST(llvm_doxygen_generate_qhp,[YES])
     AC_SUBST(llvm_doxygen_qch_filename,[org.llvm.qch])
     AC_SUBST(llvm_doxygen_qhp_namespace,[org.llvm])
-    AC_SUBST(llvm_doxygen_qhelpgenerator_path,[$QHELPGENERATOR])
-    AC_SUBST(llvm_doxygen_qhp_cust_filter_name,[$PACKAGE_STRING])
-    AC_SUBST(llvm_doxygen_qhp_cust_filter_attrs,[$PACKAGE_NAME,$PACKAGE_VERSION])
+    AC_SUBST(llvm_doxygen_qhelpgenerator_path,["$QHELPGENERATOR"])
+    AC_SUBST(llvm_doxygen_qhp_cust_filter_name,["$PACKAGE_STRING"])
+    AC_SUBST(llvm_doxygen_qhp_cust_filter_attrs,["$PACKAGE_NAME,$PACKAGE_VERSION"])
 
     dnl Qt help file for clang doxygen documentation
     AC_SUBST(clang_doxygen_generate_qhp,[YES])
     AC_SUBST(clang_doxygen_qch_filename,[org.llvm.clang.qch])
     AC_SUBST(clang_doxygen_qhp_namespace,[org.llvm.clang])
-    AC_SUBST(clang_doxygen_qhelpgenerator_path,[$QHELPGENERATOR])
-    AC_SUBST(clang_doxygen_qhp_cust_filter_name,[Clang $PACKAGE_VERSION])
-    AC_SUBST(clang_doxygen_qhp_cust_filter_attrs,[Clang,$PACKAGE_VERSION])
+    AC_SUBST(clang_doxygen_qhelpgenerator_path,["$QHELPGENERATOR"])
+    AC_SUBST(clang_doxygen_qhp_cust_filter_name,["Clang $PACKAGE_VERSION"])
+    AC_SUBST(clang_doxygen_qhp_cust_filter_attrs,["Clang,$PACKAGE_VERSION"])
     ;;
 
   no|default)
@@ -926,8 +926,8 @@ case "$enableval" in
     AC_SUBST(clang_doxygen_qch_filename,[])
     AC_SUBST(clang_doxygen_qhp_namespace,[])
     AC_SUBST(clang_doxygen_qhelpgenerator_path,[])
-    AC_SUBST(clang_doxygen_qhp_cust_filter_name,[Clang $PACKAGE_VERSION])
-    AC_SUBST(clang_doxygen_qhp_cust_filter_attrs,[Clang,$PACKAGE_VERSION])
+    AC_SUBST(clang_doxygen_qhp_cust_filter_name,["Clang $PACKAGE_VERSION"])
+    AC_SUBST(clang_doxygen_qhp_cust_filter_attrs,["Clang,$PACKAGE_VERSION"])
     ;;
 
   *)
diff --git a/configure b/configure
index 2c2a92a28da..5a313feb709 100755
--- a/configure
+++ b/configure
@@ -5221,9 +5221,9 @@ echo "$as_me: error: The option --enable-doxygen-search requires --enable-doxyge
 
         enable_server_based_search=YES
 
-        searchengine_url=$WITH_DOXYGEN_SEARCH_ENGINE_URL
+        searchengine_url="$WITH_DOXYGEN_SEARCH_ENGINE_URL"
 
-        extra_search_mappings=$WITH_DOXYGEN_SEARCH_MAPPINGS
+        extra_search_mappings="$WITH_DOXYGEN_SEARCH_MAPPINGS"
 
         ;;
 
@@ -5319,11 +5319,11 @@ fi
 
     llvm_doxygen_qhp_namespace=org.llvm
 
-    llvm_doxygen_qhelpgenerator_path=$QHELPGENERATOR
+    llvm_doxygen_qhelpgenerator_path="$QHELPGENERATOR"
 
-    llvm_doxygen_qhp_cust_filter_name=$PACKAGE_STRING
+    llvm_doxygen_qhp_cust_filter_name="$PACKAGE_STRING"
 
-    llvm_doxygen_qhp_cust_filter_attrs=$PACKAGE_NAME,$PACKAGE_VERSION
+    llvm_doxygen_qhp_cust_filter_attrs="$PACKAGE_NAME,$PACKAGE_VERSION"
 
 
         clang_doxygen_generate_qhp=YES
@@ -5332,11 +5332,11 @@ fi
 
     clang_doxygen_qhp_namespace=org.llvm.clang
 
-    clang_doxygen_qhelpgenerator_path=$QHELPGENERATOR
+    clang_doxygen_qhelpgenerator_path="$QHELPGENERATOR"
 
-    clang_doxygen_qhp_cust_filter_name=Clang $PACKAGE_VERSION
+    clang_doxygen_qhp_cust_filter_name="Clang $PACKAGE_VERSION"
 
-    clang_doxygen_qhp_cust_filter_attrs=Clang,$PACKAGE_VERSION
+    clang_doxygen_qhp_cust_filter_attrs="Clang,$PACKAGE_VERSION"
 
     ;;
 
@@ -5354,9 +5354,9 @@ fi
 
 
 
-    clang_doxygen_qhp_cust_filter_name=Clang $PACKAGE_VERSION
+    clang_doxygen_qhp_cust_filter_name="Clang $PACKAGE_VERSION"
 
-    clang_doxygen_qhp_cust_filter_attrs=Clang,$PACKAGE_VERSION
+    clang_doxygen_qhp_cust_filter_attrs="Clang,$PACKAGE_VERSION"
 
     ;;