[Asterisk-code-review] Build System: Fix --disable-xmldoc option. (asterisk[master])

[Corey Farrell]

Corey Farrell has uploaded this change for review. ( https://gerrit.asterisk.org/6877


Change subject: Build System: Fix --disable-xmldoc option.
......................................................................

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.

ASTERISK-26639 #close

Change-Id: Ifac562340c09f80c83e0203de098fcac93bf8c44
---
M configure
M configure.ac
M include/asterisk/autoconfig.h.in
M include/asterisk/xml.h
M main/config_options.c
M main/manager.c
6 files changed, 12 insertions(+), 6 deletions(-)



  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/77/6877/1

diff --git a/configure b/configure
index 588fbfd..173b169 100755
--- a/configure
+++ b/configure
@@ -14671,6 +14671,9 @@
 
 if test "${disable_xmldoc}" != "yes"; then
 
+$as_echo "#define AST_XML_DOCS 1" >>confdefs.h
+
+
 if test "x${PBX_LIBXSLT}" != "x1" -a "${USE_LIBXSLT}" != "no"; then
    pbxlibdir=""
    # if --with-LIBXSLT=DIR has been specified, use it.
diff --git a/configure.ac b/configure.ac
index c729b94..1ec5541 100644
--- a/configure.ac
+++ b/configure.ac
@@ -696,6 +696,7 @@
 	esac], [disable_xmldoc=no])
 
 if test "${disable_xmldoc}" != "yes"; then
+        AC_DEFINE([AST_XML_DOCS], 1, [Define to enable XML documentation.])
         AST_EXT_LIB_CHECK([LIBXSLT], [xslt], [xsltLoadStylesheetPI], [libxslt/xsltInternals.h], [${LIBXML2_LIB}], [${LIBXML2_INCLUDE}])
         AST_EXT_LIB_CHECK([LIBXSLT_CLEANUP], [xslt], [xsltCleanupGlobals], [libxslt/xsltInternals.h], [${LIBXML2_LIB}], [${LIBXML2_INCLUDE}])
 
diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in
index f85ad8d..5865c0a 100644
--- a/include/asterisk/autoconfig.h.in
+++ b/include/asterisk/autoconfig.h.in
@@ -9,6 +9,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 063e8c0..ab7b630 100644
--- a/include/asterisk/xml.h
+++ b/include/asterisk/xml.h
@@ -246,10 +246,5 @@
  */
 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 */
 
diff --git a/main/config_options.c b/main/config_options.c
index 8eacbda..3c0959e 100644
--- a/main/config_options.c
+++ b/main/config_options.c
@@ -80,7 +80,6 @@
 
 #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 @@
 	"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 5c0b318..079dab7 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -1653,8 +1653,10 @@
 /*! \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 @@
 	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)
 {

-- 
To view, visit https://gerrit.asterisk.org/6877
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifac562340c09f80c83e0203de098fcac93bf8c44
Gerrit-Change-Number: 6877
Gerrit-PatchSet: 1
Gerrit-Owner: Corey Farrell <git at cfware.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20171023/000683a1/attachment.html>