From 30c53656b805ddb98cec1af7db192161cb5ecc3c Mon Sep 17 00:00:00 2001 From: jez <> Date: Wed, 13 Sep 2006 21:55:51 +0000 Subject: [PATCH] made building XPath stuff conditional on availability of Boost --- examples/Makefile.am | 5 ++++- m4/ax_boost_base.m4 | 2 +- test/Makefile.am | 5 ++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/examples/Makefile.am b/examples/Makefile.am index 3a996911..f02bb1f2 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -1,4 +1,7 @@ -SUBDIRS = SAX DOM Utils XPath +SUBDIRS = SAX DOM Utils +if HAVE_BOOST + SUBDIRS += XPath +endif install: echo "Nothing to install here" diff --git a/m4/ax_boost_base.m4 b/m4/ax_boost_base.m4 index 47454ad5..45ae633d 100644 --- a/m4/ax_boost_base.m4 +++ b/m4/ax_boost_base.m4 @@ -156,7 +156,7 @@ AC_DEFUN([ARABICA_HAS_BOOST], AC_SUBST(BOOST_CPPFLAGS) AC_DEFINE(HAVE_BOOST,,[define if the Boost library is available]) fi - + AM_CONDITIONAL(HAVE_BOOST, test x$succeeded = xyes) CPPFLAGS="$CPPFLAGS_SAVED" fi ]) diff --git a/test/Makefile.am b/test/Makefile.am index 31341337..3f4786b5 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,4 +1,7 @@ -SUBDIRS = DOM SAX2DOM XPath +SUBDIRS = DOM SAX2DOM +if HAVE_BOOST + SUBDIRS += XPath +endif install: echo "Nothing to install here"