<div dir="ltr">So, you didn't a) send this out for review, or b) regenerate the configure file.<br><br>-eric<br></div><br><div class="gmail_quote">On Thu, Mar 12, 2015 at 10:33 AM Logan Chien <<a href="mailto:tzuhsiang.chien@gmail.com">tzuhsiang.chien@gmail.com</a>> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: logan<br>
Date: Thu Mar 12 12:25:01 2015<br>
New Revision: 232062<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=232062&view=rev" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project?rev=232062&view=rev</a><br>
Log:<br>
[autoconf] Refine doxygen document options.<br>
<br>
This CL adds --enable-doxygen-search to enable doxygen search engine<br>
and --enable-doxygen-qt-help to enable the Qt help file generation.<br>
<br>
Modified:<br>
llvm/trunk/autoconf/<a href="http://configure.ac" target="_blank">configure.<u></u>ac</a><br>
llvm/trunk/docs/Makefile<br>
<br>
Modified: llvm/trunk/autoconf/<a href="http://configure.ac" target="_blank">configure.<u></u>ac</a><br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/autoconf/configure.ac?rev=232062&r1=232061&r2=232062&view=diff" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project/llvm/trunk/autoconf/<u></u>configure.ac?rev=232062&r1=<u></u>232061&r2=232062&view=diff</a><br>
==============================<u></u>==============================<u></u>==================<br>
--- llvm/trunk/autoconf/<a href="http://configure.ac" target="_blank">configure.<u></u>ac</a> (original)<br>
+++ llvm/trunk/autoconf/<a href="http://configure.ac" target="_blank">configure.<u></u>ac</a> Thu Mar 12 12:25:01 2015<br>
@@ -801,11 +801,139 @@ AC_ARG_ENABLE(doxygen,<br>
enableval=default)<br>
case "$enableval" in<br>
yes) AC_SUBST(ENABLE_DOXYGEN,[1]) ;;<br>
- no) AC_SUBST(ENABLE_DOXYGEN,[0]) ;;<br>
- default) AC_SUBST(ENABLE_DOXYGEN,[0]) ;;<br>
+ no|default) AC_SUBST(ENABLE_DOXYGEN,[0]) ;;<br>
*) AC_MSG_ERROR([Invalid setting for --enable-doxygen. Use "yes" or "no"]) ;;<br>
esac<br>
<br>
+dnl Allow enablement of doxygen search engine<br>
+AC_ARG_ENABLE(doxygen-search,<br>
+ AS_HELP_STRING([--enable-<u></u>doxygen-search],<br>
+ [Enable doxygen search support (default is NO)]),,<br>
+ enableval=default)<br>
+ENABLE_DOXYGEN_SEARCH="$<u></u>enableval"<br>
+<br>
+case "$enableval" in<br>
+ yes|no|default) ;;<br>
+ *) AC_MSG_ERROR([Invalid setting for --enable-doxygen-search. Use "yes" or "no"]) ;;<br>
+esac<br>
+<br>
+AC_ARG_ENABLE(doxygen-<u></u>external-search,<br>
+ AS_HELP_STRING([--enable-<u></u>doxygen-external-search],<br>
+ [Enable doxygen exteranl search (default is NO)]),,<br>
+ enableval=default)<br>
+ENABLE_DOXYGEN_EXTERNAL_<u></u>SEARCH="$enableval"<br>
+<br>
+case "$enableval" in<br>
+ yes)<br>
+ dnl To match with the CMake behavior, enable doxygen when<br>
+ dnl --enable-doxygen-external-<u></u>search is enabled.<br>
+ case "$ENABLE_DOXYGEN_SEARCH" in<br>
+ yes|default) ENABLE_DOXYGEN_SEARCH="yes" ;;<br>
+ no) AC_MSG_ERROR([The option --enable-doxygen-external-<u></u>search requires --enable-doxygen-search]) ;;<br>
+ esac<br>
+ ;;<br>
+ no|default) ;;<br>
+ *) AC_MSG_ERROR([Invalid setting for --enable-doxygen-external-<u></u>search. Use "yes" or "no"]) ;;<br>
+esac<br>
+<br>
+AC_ARG_WITH(doxygen-search-<u></u>engine-url,<br>
+ AS_HELP_STRING([--with-<u></u>doxygen-search-engine-url],<br>
+ [Specify the external search engine for doxygen]),,)<br>
+WITH_DOXYGEN_SEARCH_ENGINE_<u></u>URL="$withval"<br>
+<br>
+AC_ARG_WITH(doxygen-search-<u></u>mappings,<br>
+ AS_HELP_STRING([--with-<u></u>doxygen-search-mappings],<br>
+ [Specify the extra search mapping for doxygen]),,)<br>
+WITH_DOXYGEN_SEARCH_MAPPINGS=<u></u>"$withval"<br>
+<br>
+case "$ENABLE_DOXYGEN_SEARCH" in<br>
+ yes)<br>
+ if test "$ENABLE_DOXYGEN" = "0" ; then<br>
+ AC_MSG_ERROR([The option --enable-doxygen-search requires --enable-doxygen.])<br>
+ fi<br>
+<br>
+ AC_SUBST(enable_searchengine,[<u></u>YES])<br>
+<br>
+ case "$ENABLE_DOXYGEN_EXTERNAL_<u></u>SEARCH" in<br>
+ yes)<br>
+ AC_SUBST(enable_external_<u></u>search,[YES])<br>
+ AC_SUBST(enable_server_based_<u></u>search,[YES])<br>
+ AC_SUBST(searchengine_url,[$<u></u>WITH_DOXYGEN_SEARCH_ENGINE_<u></u>URL])<br>
+ AC_SUBST(extra_search_<u></u>mappings,[$WITH_DOXYGEN_<u></u>SEARCH_MAPPINGS])<br>
+ ;;<br>
+<br>
+ no|default)<br>
+ AC_SUBST(enable_external_<u></u>search,[NO])<br>
+ AC_SUBST(enable_server_based_<u></u>search,[NO])<br>
+ AC_SUBST(searchengine_url,[])<br>
+ AC_SUBST(extra_search_<u></u>mappings,[])<br>
+ ;;<br>
+ esac<br>
+ ;;<br>
+<br>
+ no|default)<br>
+ AC_SUBST(enable_searchengine,[<u></u>NO])<br>
+ AC_SUBST(searchengine_url,[])<br>
+ AC_SUBST(enable_server_based_<u></u>search,[NO])<br>
+ AC_SUBST(enable_external_<u></u>search,[NO])<br>
+ AC_SUBST(extra_search_<u></u>mappings,[])<br>
+ ;;<br>
+<br>
+ *)<br>
+ AC_MSG_ERROR([Invalid setting for --enable-doxygen-search. Use "yes" or "no"])<br>
+ ;;<br>
+esac<br>
+<br>
+dnl Allow enablement of doxygen generated Qt help files<br>
+AC_ARG_ENABLE(doxygen-qt-<u></u>help,<br>
+ AS_HELP_STRING([--enable-<u></u>doxygen-qt-help],<br>
+ [Build Qt help files (default is NO)]),,<br>
+ enableval=default)<br>
+case "$enableval" in<br>
+ yes)<br>
+ if test "$ENABLE_DOXYGEN" = "0" ; then<br>
+ AC_MSG_ERROR([The option --enable-doxygen-qt-help requires --enable-doxygen.])<br>
+ fi<br>
+<br>
+ AC_PATH_PROG(QHELPGENERATOR, [qhelpgenerator], [qhelpgenerator])<br>
+<br>
+ dnl Qt help file for llvm doxygen documentation<br>
+ AC_SUBST(llvm_doxygen_<u></u>generate_qhp,[YES])<br>
+ AC_SUBST(llvm_doxygen_qch_<u></u>filename,[org.llvm.qch])<br>
+ AC_SUBST(llvm_doxygen_qhp_<u></u>namespace,[org.llvm])<br>
+ AC_SUBST(llvm_doxygen_<u></u>qhelpgenerator_path,[$<u></u>QHELPGENERATOR])<br>
+ AC_SUBST(llvm_doxygen_qhp_<u></u>cust_filter_name,[$PACKAGE_<u></u>STRING])<br>
+ AC_SUBST(llvm_doxygen_qhp_<u></u>cust_filter_attrs,[$PACKAGE_<u></u>NAME,$PACKAGE_VERSION])<br>
+<br>
+ dnl Qt help file for clang doxygen documentation<br>
+ AC_SUBST(clang_doxygen_<u></u>generate_qhp,[YES])<br>
+ AC_SUBST(clang_doxygen_qch_<u></u>filename,[org.llvm.clang.qch])<br>
+ AC_SUBST(clang_doxygen_qhp_<u></u>namespace,[org.llvm.clang])<br>
+ AC_SUBST(clang_doxygen_<u></u>qhelpgenerator_path,[$<u></u>QHELPGENERATOR])<br>
+ AC_SUBST(clang_doxygen_qhp_<u></u>cust_filter_name,[Clang $PACKAGE_VERSION])<br>
+ AC_SUBST(clang_doxygen_qhp_<u></u>cust_filter_attrs,[Clang,$<u></u>PACKAGE_VERSION])<br>
+ ;;<br>
+<br>
+ no|default)<br>
+ AC_SUBST(llvm_doxygen_<u></u>generate_qhp,[NO])<br>
+ AC_SUBST(llvm_doxygen_qch_<u></u>filename,[])<br>
+ AC_SUBST(llvm_doxygen_qhp_<u></u>namespace,[])<br>
+ AC_SUBST(llvm_doxygen_<u></u>qhelpgenerator_path,[])<br>
+ AC_SUBST(llvm_doxygen_qhp_<u></u>cust_filter_name,[])<br>
+ AC_SUBST(llvm_doxygen_qhp_<u></u>cust_filter_attrs,[])<br>
+<br>
+ AC_SUBST(clang_doxygen_<u></u>generate_qhp,[NO])<br>
+ AC_SUBST(clang_doxygen_qch_<u></u>filename,[])<br>
+ AC_SUBST(clang_doxygen_qhp_<u></u>namespace,[])<br>
+ AC_SUBST(clang_doxygen_<u></u>qhelpgenerator_path,[])<br>
+ AC_SUBST(clang_doxygen_qhp_<u></u>cust_filter_name,[Clang $PACKAGE_VERSION])<br>
+ AC_SUBST(clang_doxygen_qhp_<u></u>cust_filter_attrs,[Clang,$<u></u>PACKAGE_VERSION])<br>
+ ;;<br>
+<br>
+ *)<br>
+ AC_MSG_ERROR([Invalid setting for --enable-doxygen-qt-help. Use "yes" or "no"]) ;;<br>
+esac<br>
+<br>
dnl Allow disablement of threads<br>
AC_ARG_ENABLE(threads,<br>
AS_HELP_STRING([--enable-<u></u>threads],<br>
<br>
Modified: llvm/trunk/docs/Makefile<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/Makefile?rev=232062&r1=232061&r2=232062&view=diff" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project/llvm/trunk/docs/<u></u>Makefile?rev=232062&r1=232061&<u></u>r2=232062&view=diff</a><br>
==============================<u></u>==============================<u></u>==================<br>
--- llvm/trunk/docs/Makefile (original)<br>
+++ llvm/trunk/docs/Makefile Thu Mar 12 12:25:01 2015<br>
@@ -16,15 +16,22 @@ DOXYGEN = doxygen<br>
<br>
$(PROJ_OBJ_DIR)/doxygen.cfg: <a href="http://doxygen.cfg.in" target="_blank">doxygen.cfg.in</a><br>
cat $< | sed \<br>
- -e 's/@abs_top_srcdir@/../g' \<br>
-e 's/@DOT@/dot/g' \<br>
-e 's/@PACKAGE_VERSION@/mainline/<u></u>' \<br>
-e 's/@abs_top_builddir@/../g' \<br>
+ -e 's/@abs_top_srcdir@/../g' \<br>
+ -e 's/@enable_external_search@/<u></u>NO/g' \<br>
-e 's/@enable_searchengine@/NO/g' \<br>
- -e 's/@searchengine_url@//g' \<br>
-e 's/@enable_server_based_<u></u>search@/NO/g' \<br>
- -e 's/@enable_external_search@/<u></u>NO/g' \<br>
- -e 's/@extra_search_mappings@//g' > $@<br>
+ -e 's/@extra_search_mappings@//g' \<br>
+ -e 's/@llvm_doxygen_generate_qhp@<u></u>//g' \<br>
+ -e 's/@llvm_doxygen_qch_filename@<u></u>//g' \<br>
+ -e 's/@llvm_doxygen_<u></u>qhelpgenerator_path@//g' \<br>
+ -e 's/@llvm_doxygen_qhp_cust_<u></u>filter_attrs@//g' \<br>
+ -e 's/@llvm_doxygen_qhp_cust_<u></u>filter_name@//g' \<br>
+ -e 's/@llvm_doxygen_qhp_<u></u>namespace@//g' \<br>
+ -e 's/@searchengine_url@//g' \<br>
+ > $@<br>
endif<br>
<br>
include $(LEVEL)/Makefile.common<br>
<br>
<br>
______________________________<u></u>_________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu" target="_blank">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/<u></u>mailman/listinfo/llvm-commits</a><br>
</blockquote></div>