diff options
| author | Niels de Vos <ndevos@redhat.com> | 2018-07-30 17:15:35 +0200 |
|---|---|---|
| committer | Amar Tumballi <amarts@redhat.com> | 2018-08-16 06:55:21 +0000 |
| commit | fa2f092709a6a2d91213cb3410fc5b5109d84646 (patch) | |
| tree | 1238bc8947fee3bb97e1857bc1127efe5ceabd69 | |
| parent | 90b102fa0361523a706a25c85b56ee6f536f6277 (diff) | |
build: use standard PKG_CHECK_MODULES for libxml2 availability
In case the development parts of libxml2 are not installed, it was
required to re-run ./autogen.sh to cleanup the cached values for the
check. This is not nice towards users. By using the standard
PKG_CHECK_MODULES for libxml-2.0 the results of the check are not cached
and will be probed again when running ./configure.
Change-Id: I3c4586e5555a521be5d4fb61bdb873ae0317311a
Fixes: bz#1599219
Reported-by: Sachidananda Urs <surs@redhat.com>
Signed-off-by: Niels de Vos <ndevos@redhat.com>
| -rw-r--r-- | cli/src/Makefile.am | 5 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | heal/src/Makefile.am | 5 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/Makefile.am | 4 |
4 files changed, 7 insertions, 10 deletions
diff --git a/cli/src/Makefile.am b/cli/src/Makefile.am index c6323e591de..6be070f6ff7 100644 --- a/cli/src/Makefile.am +++ b/cli/src/Makefile.am @@ -21,10 +21,9 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) \ -DDATADIR=\"$(localstatedir)\" \ -DCONFDIR=\"$(sysconfdir)/glusterfs\" \ -DGSYNCD_PREFIX=\"$(GLUSTERFS_LIBEXECDIR)\"\ - -DSYNCDAEMON_COMPILE=$(SYNCDAEMON_COMPILE) -DSBIN_DIR=\"$(sbindir)\"\ - $(XML_CPPFLAGS) + -DSYNCDAEMON_COMPILE=$(SYNCDAEMON_COMPILE) -DSBIN_DIR=\"$(sbindir)\" -AM_CFLAGS = -Wall $(GF_CFLAGS) +AM_CFLAGS = -Wall $(GF_CFLAGS) $(XML_CFLAGS) CLEANFILES = diff --git a/configure.ac b/configure.ac index efd98c53012..54b52a35f8c 100644 --- a/configure.ac +++ b/configure.ac @@ -963,8 +963,7 @@ AC_ARG_ENABLE([xml-output], [Disable the xml output])) BUILD_XML_OUTPUT="yes" if test "x$enable_xml_output" != "xno"; then - #check if libxml is present if so enable HAVE_LIB_XML - m4_ifdef([AM_PATH_XML2],[AM_PATH_XML2([2.6.19])], [no_xml=yes]) + PKG_CHECK_MODULES([XML], [libxml-2.0], [], [no_xml="yes"]) if test "x${no_xml}" = "x"; then AC_DEFINE([HAVE_LIB_XML], [1], [Define to 1 if using libxml2.]) else diff --git a/heal/src/Makefile.am b/heal/src/Makefile.am index e3bec6b7b1e..f04a294cc56 100644 --- a/heal/src/Makefile.am +++ b/heal/src/Makefile.am @@ -19,10 +19,9 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) \ -I$(top_builddir)/rpc/xdr/src\ -I$(top_srcdir)/api/src\ -DDATADIR=\"$(localstatedir)\" \ - -DSBIN_DIR=\"$(sbindir)\" \ - $(XML_CPPFLAGS) + -DSBIN_DIR=\"$(sbindir)\" -AM_CFLAGS = -Wall $(GF_CFLAGS) +AM_CFLAGS = -Wall $(GF_CFLAGS) $(XML_CFLAGS) CLEANFILES = diff --git a/xlators/mgmt/glusterd/src/Makefile.am b/xlators/mgmt/glusterd/src/Makefile.am index 7f8f235c171..aa75344d1ac 100644 --- a/xlators/mgmt/glusterd/src/Makefile.am +++ b/xlators/mgmt/glusterd/src/Makefile.am @@ -55,10 +55,10 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \ -I$(CONTRIBDIR)/mount -I$(CONTRIBDIR)/userspace-rcu \ -DSBIN_DIR=\"$(sbindir)\" -DDATADIR=\"$(localstatedir)\" \ -DGSYNCD_PREFIX=\"$(GLUSTERFS_LIBEXECDIR)\" \ - -DSYNCDAEMON_COMPILE=$(SYNCDAEMON_COMPILE) $(XML_CPPFLAGS) + -DSYNCDAEMON_COMPILE=$(SYNCDAEMON_COMPILE) -AM_CFLAGS = -Wall $(GF_CFLAGS) $(URCU_CFLAGS) $(URCU_CDS_CFLAGS) +AM_CFLAGS = -Wall $(GF_CFLAGS) $(URCU_CFLAGS) $(URCU_CDS_CFLAGS) $(XML_CFLAGS) AM_LDFLAGS = -L$(xlatordir) $(URCU_LIBS) $(URCU_CDS_LIBS) |