diff options
author | Corey Farrell <git@cfware.com> | 2017-03-30 10:51:14 -0400 |
---|---|---|
committer | Corey Farrell <git@cfware.com> | 2017-10-25 10:26:16 -0500 |
commit | 4772849016ec17c77045fc552944490fb4ab83f0 (patch) | |
tree | 61605523f5bf7da0f14790eab90524a3a92d3c33 /include | |
parent | cf63db721767bb6f1302ea3ed8e664494f1f63ec (diff) |
Build System: Fix --disable-xmldoc option.
The configure option to disable XML documentation does not currently
work. This patch makes it effective, but also causes an ABI change by
removing the ast_xmldoc_* symbols. Disabling xmldoc also prevents docs
from being automatically generated, but they can still be manually
generated with 'make doc/core-en_US.xml'.
ASTERISK-26639
Change-Id: Ifac562340c09f80c83e0203de098fcac93bf8c44
Diffstat (limited to 'include')
-rw-r--r-- | include/asterisk/autoconfig.h.in | 3 | ||||
-rw-r--r-- | include/asterisk/xml.h | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in index 723d84d36..b0b8e8244 100644 --- a/include/asterisk/autoconfig.h.in +++ b/include/asterisk/autoconfig.h.in @@ -10,6 +10,9 @@ /* Define to 1 if internal poll should be used. */ #undef AST_POLL_COMPAT +/* Define to enable XML documentation. */ +#undef AST_XML_DOCS + /* Define to 1 if your system's implementation of mutexes supports comparison of a mutex to its initializer. */ #undef CAN_COMPARE_MUTEX_TO_INIT_VALUE diff --git a/include/asterisk/xml.h b/include/asterisk/xml.h index 063e8c0b3..ab7b630a2 100644 --- a/include/asterisk/xml.h +++ b/include/asterisk/xml.h @@ -246,10 +246,5 @@ struct ast_xml_node *ast_xml_xpath_get_first_result(struct ast_xml_xpath_results */ struct ast_xml_xpath_results *ast_xml_query(struct ast_xml_doc *doc, const char *xpath_str); -/* Features using ast_xml_ */ -#ifdef HAVE_LIBXML2 -#define AST_XML_DOCS -#endif - #endif /* _ASTERISK_XML_H */ |