summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès2012-06-01 18:14:16 +0200
committerLudovic Courtès2012-06-01 18:14:16 +0200
commit0d38cbba0b9bbfd3c885c7f24e2b224579a334a4 (patch)
tree12d4d7229fab634b6ed0aa497b06d374f8577c02
parent1392f286a810f4cc227ced3cf832495b4eaae974 (diff)
downloadskribilo-0d38cbba0b9bbfd3c885c7f24e2b224579a334a4.tar.gz
skribilo-0d38cbba0b9bbfd3c885c7f24e2b224579a334a4.tar.lz
skribilo-0d38cbba0b9bbfd3c885c7f24e2b224579a334a4.zip
build: Don't build/test the RSS-2 reader when its requirements aren't met.
Reported by rvclayton@verizon.net (R. Clayton). * configure.ac: Add `BUILD_RSS2_READER' Automake conditional. * src/guile/Makefile.am (readers): Make `skribilo/reader/rss-2.scm' conditional on `BUILD_RSS2_READER'. (EXTRA_DIST)[!BUILD_RSS2_READER]: Add `skribilo/reader/rss-2.scm'. * tests/Makefile.am (TESTS): Make `readers/rss-2.test' conditional on `BUILD_RSS2_READER'. (EXTRA_DIST)[!BUILD_RSS2_READER]: Add `readers/rss-2.test'.
-rw-r--r--configure.ac3
-rw-r--r--src/guile/Makefile.am14
-rw-r--r--tests/Makefile.am11
3 files changed, 25 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 505d8e6..2402e6f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,6 +63,9 @@ if test "x$have_sxml_simple$have_htmlprag" != "xyesyes"; then
AC_MSG_WARN([Guile-Lib modules needed by the `rss-2' reader are missing.])
fi
+AM_CONDITIONAL([BUILD_RSS2_READER],
+ [test "x$have_sxml_simple$have_htmlprag" == "xyesyes"])
+
# Look for `convert', from ImageMagick.
AC_PATH_PROG([CONVERT], [convert])
if test "x$CONVERT" == "x"; then
diff --git a/src/guile/Makefile.am b/src/guile/Makefile.am
index eb44261..ea5df96 100644
--- a/src/guile/Makefile.am
+++ b/src/guile/Makefile.am
@@ -47,8 +47,18 @@ SOURCES = \
SOURCES += $(readers) $(packages) $(engines)
readers = \
- skribilo/reader/skribe.scm skribilo/reader/outline.scm \
- skribilo/reader/rss-2.scm
+ skribilo/reader/skribe.scm skribilo/reader/outline.scm
+
+if BUILD_RSS2_READER
+
+readers += skribilo/reader/rss-2.scm
+
+else !BUILD_RSS2_READER
+
+EXTRA_DIST += skribilo/reader/rss-2.scm
+
+endif !BUILD_RSS2_READER
+
engines = \
skribilo/engine/base.scm skribilo/engine/context.scm \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4798202..87d7641 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -6,10 +6,19 @@ TESTS_ENVIRONMENT = \
TESTS = \
ast.test \
resolve.test \
- readers/rss-2.test \
engines/info.test \
location.test
+if BUILD_RSS2_READER
+
+TESTS += readers/rss-2.test
EXTRA_DIST = $(TESTS)
+else !BUILD_RSS2_READER
+
+EXTRA_DIST = $(TESTS) readers/rss-2.test
+
+endif !BUILD_RSS2_READER
+
+
CLEANFILES = ast.log resolve.log rss-2.log location.log info.log