.......... [DEV-2114] refactored libzbxxml library

8 files changed, 13 insertions, 2 deletions

diff --git a/tests/libs/zbxcommon/Makefile.am b/tests/libs/zbxcommon/Makefile.am
index 3a89906dbd2..dc77b9cb3ee 100644
--- a/tests/libs/zbxcommon/Makefile.am
+++ b/tests/libs/zbxcommon/Makefile.am
@@ -83,6 +83,7 @@ COMMON_LIB_FILES = \
 	$(top_srcdir)/src/libs/zbxnix/libzbxnix.a \
 	$(top_srcdir)/src/libs/zbxcrypto/libzbxcrypto.a \
 	$(top_srcdir)/src/libs/zbxcomms/libzbxcomms.a \
+	$(top_srcdir)/src/libs/zbxxml/libzbxxml.a \
 	$(top_srcdir)/src/libs/zbxcompress/libzbxcompress.a \
 	$(top_srcdir)/src/libs/zbxjson/libzbxjson.a \
 	$(top_srcdir)/src/libs/zbxcommon/libzbxcommon.a \
@@ -203,7 +204,7 @@ zbx_json_to_xml_LDADD += @SERVER_LIBS@
 
 zbx_json_to_xml_LDFLAGS = @SERVER_LDFLAGS@
 
-zbx_json_to_xml_CFLAGS = $(COMMON_COMPILER_FLAGS)
+zbx_json_to_xml_CFLAGS = $(COMMON_COMPILER_FLAGS) @LIBXML2_CFLAGS@
 
 
 zbx_xml_to_json_SOURCES = \
@@ -217,7 +218,7 @@ zbx_xml_to_json_LDADD += @SERVER_LIBS@
 
 zbx_xml_to_json_LDFLAGS = @SERVER_LDFLAGS@
 
-zbx_xml_to_json_CFLAGS = $(COMMON_COMPILER_FLAGS)
+zbx_xml_to_json_CFLAGS = $(COMMON_COMPILER_FLAGS) @LIBXML2_CFLAGS@
 
 
 zbx_token_find_SOURCES = \
diff --git a/tests/libs/zbxcommon/zbx_json_to_xml.c b/tests/libs/zbxcommon/zbx_json_to_xml.c
index 0f9972b65eb..461245bfe3c 100644
--- a/tests/libs/zbxcommon/zbx_json_to_xml.c
+++ b/tests/libs/zbxcommon/zbx_json_to_xml.c
@@ -20,6 +20,8 @@
 #include "zbxmocktest.h"
 #include "zbxmockutil.h"
 
+#include "zbxxml.h"
+
 #define ZBX_XML_HEADER_SIZE	22
 
 void	zbx_mock_test_entry(void **state)
diff --git a/tests/libs/zbxcommon/zbx_xml_to_json.c b/tests/libs/zbxcommon/zbx_xml_to_json.c
index 9ed16045f2b..7a2777a5e45 100644
--- a/tests/libs/zbxcommon/zbx_xml_to_json.c
+++ b/tests/libs/zbxcommon/zbx_xml_to_json.c
@@ -20,6 +20,8 @@
 #include "zbxmocktest.h"
 #include "zbxmockutil.h"
 
+#include "zbxxml.h"
+
 void	zbx_mock_test_entry(void **state)
 {
 	char	*xml, *expected_json, *json = NULL, *error = NULL;
diff --git a/tests/libs/zbxcomms/Makefile.am b/tests/libs/zbxcomms/Makefile.am
index 52b75778463..71e8bd25e0c 100644
--- a/tests/libs/zbxcomms/Makefile.am
+++ b/tests/libs/zbxcomms/Makefile.am
@@ -25,6 +25,7 @@ COMMON_LIB_FILES = \
 	$(top_srcdir)/src/libs/zbxconf/libzbxconf.a \
 	$(top_srcdir)/src/libs/zbxlog/libzbxlog.a \
 	$(top_srcdir)/src/libs/zbxsys/libzbxsys.a \
+	$(top_srcdir)/src/libs/zbxxml/libzbxxml.a \
 	$(top_srcdir)/src/libs/zbxcommon/libzbxcommon.a \
 	$(top_srcdir)/src/libs/zbxcrypto/libzbxcrypto.a \
 	$(top_srcdir)/src/libs/zbxjson/libzbxjson.a \
diff --git a/tests/libs/zbxcommshigh/Makefile.am b/tests/libs/zbxcommshigh/Makefile.am
index 3798a316fce..af699c1fd05 100644
--- a/tests/libs/zbxcommshigh/Makefile.am
+++ b/tests/libs/zbxcommshigh/Makefile.am
@@ -25,6 +25,7 @@ COMMON_LIB_FILES = \
 	$(top_srcdir)/src/libs/zbxconf/libzbxconf.a \
 	$(top_srcdir)/src/libs/zbxlog/libzbxlog.a \
 	$(top_srcdir)/src/libs/zbxsys/libzbxsys.a \
+	$(top_srcdir)/src/libs/zbxxml/libzbxxml.a \
 	$(top_srcdir)/src/libs/zbxcommon/libzbxcommon.a \
 	$(top_srcdir)/src/libs/zbxcrypto/libzbxcrypto.a \
 	$(top_srcdir)/src/libs/zbxjson/libzbxjson.a \
diff --git a/tests/libs/zbxsysinfo/Makefile.am b/tests/libs/zbxsysinfo/Makefile.am
index 17de2bbc969..6d8ed642636 100644
--- a/tests/libs/zbxsysinfo/Makefile.am
+++ b/tests/libs/zbxsysinfo/Makefile.am
@@ -80,6 +80,7 @@ parse_item_key_LDADD = \
 	$(top_srcdir)/src/libs/zbxdb/libzbxdb.a \
 	$(top_srcdir)/src/libs/zbxmodules/libzbxmodules.a \
 	$(top_srcdir)/src/libs/zbxtasks/libzbxtasks.a \
+	$(top_srcdir)/src/libs/zbxxml/libzbxxml.a \
 	$(top_srcdir)/src/zabbix_server/libzbxserver.a \
 	$(top_srcdir)/tests/libzbxmocktest.a \
 	$(top_srcdir)/tests/libzbxmockdata.a
@@ -115,6 +116,7 @@ COMMON_LIB_FILES = \
 	$(top_srcdir)/src/libs/zbxmodules/libzbxmodules.a \
 	$(top_srcdir)/src/zabbix_agent/libzbxagent.a \
 	$(top_srcdir)/src/libs/zbxnix/libzbxnix.a \
+	$(top_srcdir)/src/libs/zbxxml/libzbxxml.a \
 	$(top_srcdir)/tests/libzbxmocktest.a \
 	$(top_srcdir)/tests/libzbxmockdata.a
 
diff --git a/tests/libs/zbxsysinfo/common/Makefile.am b/tests/libs/zbxsysinfo/common/Makefile.am
index b66785e1c36..d818c4ec1d2 100644
--- a/tests/libs/zbxsysinfo/common/Makefile.am
+++ b/tests/libs/zbxsysinfo/common/Makefile.am
@@ -35,6 +35,7 @@ COMMON_LIB_FILES = \
 	$(top_srcdir)/src/libs/zbxhttp/libzbxhttp.a \
 	$(top_srcdir)/src/libs/zbxexec/libzbxexec.a \
 	$(top_srcdir)/src/libs/zbxmodules/libzbxmodules.a \
+	$(top_srcdir)/src/libs/zbxxml/libzbxxml.a \
 	$(top_srcdir)/src/zabbix_agent/libzbxagent.a \
 	$(top_srcdir)/src/libs/zbxnix/libzbxnix.a \
 	$(top_srcdir)/tests/libzbxmocktest.a \
diff --git a/tests/libs/zbxsysinfo/linux/Makefile.am b/tests/libs/zbxsysinfo/linux/Makefile.am
index 498ef42b76b..ad7cfe07732 100644
--- a/tests/libs/zbxsysinfo/linux/Makefile.am
+++ b/tests/libs/zbxsysinfo/linux/Makefile.am
@@ -43,6 +43,7 @@ COMMON_LIB_FILES = \
 	$(top_srcdir)/src/libs/zbxhttp/libzbxhttp.a \
 	$(top_srcdir)/src/libs/zbxexec/libzbxexec.a \
 	$(top_srcdir)/src/libs/zbxmodules/libzbxmodules.a \
+	$(top_srcdir)/src/libs/zbxxml/libzbxxml.a \
 	$(top_srcdir)/src/zabbix_agent/libzbxagent.a \
 	$(top_srcdir)/src/libs/zbxnix/libzbxnix.a \
 	$(top_srcdir)/tests/libzbxmocktest.a \