X-Git-Url: http://plrg.eecs.uci.edu/git/?p=oota-llvm.git;a=blobdiff_plain;f=autoconf%2Fconfigure.ac;h=4d70acdf80a30721e994ffed2bee4e2b3190da0b;hp=19f7a2e20c8d56bcd6093886e93b4c6f130d99b4;hb=fed84edb618fca6c29850787b8ae984f0a4ad30e;hpb=be45e0e6696d73f45c2dbd9c2a4ba8b422de08ad

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"])
     ;;
 
   *)