From 4172ce1fb2a87329cafda656d4a251bce60dcef6 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Sat, 16 Jun 2007 20:58:00 +0000 Subject: [PATCH] 2007-06-16 Emmanuele Bassi * configure.ac: Partially revert last commit, and fail with AC_MSG_ERROR() instead of disabling the manual build if no jw and xmlto were found. --- ChangeLog | 6 ++++++ clutter/clutter-actor.c | 5 ++++- configure.ac | 6 ++---- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index bbca9595e..fb28b5fe5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-06-16 Emmanuele Bassi + + * configure.ac: Partially revert last commit, and fail + with AC_MSG_ERROR() instead of disabling the manual build + if no jw and xmlto were found. + 2007-06-16 Emmanuele Bassi * configure.ac: If the programs required to build the manual diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c index e6bbbbfa9..0fc5755fc 100644 --- a/clutter/clutter-actor.c +++ b/clutter/clutter-actor.c @@ -27,7 +27,10 @@ * SECTION:clutter-actor * @short_description: Base abstract class for all visual stage actors. * - * #ClutterActor is a base abstract class for all visual elements. + * #ClutterActor is a base abstract class for all visual elements on the + * stage. Every object that must appear on the main #ClutterStage must also + * be a #ClutterActor, either by using one of the classes provided by + * Clutter, or by implementing a new #ClutterActor subclass. */ #include "config.h" diff --git a/configure.ac b/configure.ac index 7262f361a..1f876cda9 100644 --- a/configure.ac +++ b/configure.ac @@ -265,14 +265,12 @@ AC_ARG_ENABLE(manual, if test "x$enable_manual" = "xyes"; then AC_PATH_PROG(JW, jw, no) if test "x$JW" = "xno"; then - AC_MSG_WARN(['jw' program not found in path, disabling manual]) - enable_manual=no + AC_MSG_ERROR(['jw' program needed by the manual not found in path]) fi AC_PATH_PROG(XMLTO, xmlto, no) if test "x$XMLTO" = "xno"; then - AC_MSG_WARN(['xmlto' program not found in path, disabling manual]) - enable_manual=no + AC_MSG_ERROR(['xmlto' program needed by the manual not found in path]) fi fi