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:12 -0500 |
| commit | ddcf98c0d378feca24936d2bf9aa7dd9f24f87ff (patch) | |
| tree | 0be733a5966327b6a1bd33bebb31529afa295a5c /main | |
| parent | aa1c969942e9e209790e3e2093308e287595bffe (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 'main')
| -rw-r--r-- | main/config_options.c | 2 | ||||
| -rw-r--r-- | main/manager.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/main/config_options.c b/main/config_options.c index 8eacbda35..3c0959ea3 100644 --- a/main/config_options.c +++ b/main/config_options.c @@ -80,7 +80,6 @@ struct aco_option { #ifdef AST_XML_DOCS static struct ao2_container *xmldocs; -#endif /* AST_XML_DOCS */ /*! \brief Value of the aco_option_type enum as strings */ static char *aco_option_type_string[] = { @@ -98,6 +97,7 @@ static char *aco_option_type_string[] = { "Unsigned Integer", /* OPT_UINT_T, */ "Boolean", /* OPT_YESNO_T, */ }; +#endif /* AST_XML_DOCS */ void *aco_pending_config(struct aco_info *info) { diff --git a/main/manager.c b/main/manager.c index 5c0b318b9..079dab77f 100644 --- a/main/manager.c +++ b/main/manager.c @@ -1653,8 +1653,10 @@ static AST_RWLIST_HEAD_STATIC(actions, manager_action); /*! \brief list of hooks registered */ static AST_RWLIST_HEAD_STATIC(manager_hooks, manager_custom_hook); +#ifdef AST_XML_DOCS /*! \brief A container of event documentation nodes */ static AO2_GLOBAL_OBJ_STATIC(event_docs); +#endif static int __attribute__((format(printf, 9, 0))) __manager_event_sessions( struct ao2_container *sessions, @@ -2305,7 +2307,9 @@ static int manager_displayconnects(struct mansession_session *session) return ret; } +#ifdef AST_XML_DOCS static void print_event_instance(struct ast_cli_args *a, struct ast_xml_doc_item *instance); +#endif static char *handle_showmancmd(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a) { |