From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Tue, 4 Oct 2016 18:37:57 +0000 (-0400)
Subject: Build: Replace use of deprecated AM_PATH_XML2
X-Git-Tag: v2.9.0-rc1~41
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=3470712592caf0486715372f72324141b79f5dd3;p=lttng-tools.git

Build: Replace use of deprecated AM_PATH_XML2

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/configure.ac b/configure.ac
index 810e1f19d..9b13e3593 100644
--- a/configure.ac
+++ b/configure.ac
@@ -324,7 +324,9 @@ PKG_CHECK_MODULES([POPT], [popt],
 	]
 )
 
-AM_PATH_XML2(2.7.6, true, AC_MSG_ERROR(No supported version of libxml2 found.))
+PKG_CHECK_MODULES([libxml2], [libxml-2.0 >= 2.7.6])
+AC_SUBST([XML_CFLAGS])
+AC_SUBST([XML_LIBS])
 
 # Check for uuid in system libs
 AC_CHECK_FUNCS([uuid_generate],
diff --git a/src/common/config/Makefile.am b/src/common/config/Makefile.am
index 6e33d5b60..afc83f26f 100644
--- a/src/common/config/Makefile.am
+++ b/src/common/config/Makefile.am
@@ -4,8 +4,8 @@ noinst_LTLIBRARIES = libconfig.la
 
 libconfig_la_SOURCES = ini.c ini.h session-config.c session-config.h \
 		config-session-abi.h config-internal.h
-libconfig_la_CPPFLAGS = $(XML_CPPFLAGS) $(AM_CPPFLAGS)
-libconfig_la_LIBADD = $(XML_LIBS)
+libconfig_la_CPPFLAGS = $(libxml2_CFLAGS) $(AM_CPPFLAGS)
+libconfig_la_LIBADD = ${libxml2_LIBS}
 
 xmldir = $(datadir)/xml/lttng
 dist_xml_DATA = session.xsd
diff --git a/tests/regression/tools/mi/Makefile.am b/tests/regression/tools/mi/Makefile.am
index f5d5e2130..f26efe0d0 100644
--- a/tests/regression/tools/mi/Makefile.am
+++ b/tests/regression/tools/mi/Makefile.am
@@ -2,12 +2,12 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
 
 noinst_PROGRAMS = validate_xml extract_xml
 validate_xml_SOURCES = validate_xml.c
-validate_xml_CPPFLAGS = $(XML_CPPFLAGS) $(AM_CPPFLAGS)
-validate_xml_LDADD = $(XML_LIBS)
+validate_xml_CPPFLAGS = $(libxml2_CFLAGS) $(AM_CPPFLAGS)
+validate_xml_LDADD = $(libxml2_LIBS)
 
 extract_xml_SOURCES = extract_xml.c
-extract_xml_CPPFLAGS = $(XML_CPPFLAGS) $(AM_CPPFLAGS)
-extract_xml_LDADD = $(XML_LIBS)
+extract_xml_CPPFLAGS = $(libxml2_CFLAGS) $(AM_CPPFLAGS)
+extract_xml_LDADD = $(libxml2_LIBS)
 
 noinst_SCRIPTS = test_mi
 EXTRA_DIST = test_mi