From 1c98367ad1af181eef0e5bb2c7961a4723df9a3a Mon Sep 17 00:00:00 2001 From: Bertrand Lorentz Date: Mon, 6 Jun 2011 20:35:05 +0200 Subject: [PATCH] build: Fix error during configure if gnome-doc-utils is not installed Always set the ENABLE_SK conditional, so that it is defined even if GNOME_DOC_INIT is not called. Fixes issue #198. --- build/m4/shamrock/gnome-doc.m4 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build/m4/shamrock/gnome-doc.m4 b/build/m4/shamrock/gnome-doc.m4 index 3f5f638e..fe1d008c 100644 --- a/build/m4/shamrock/gnome-doc.m4 +++ b/build/m4/shamrock/gnome-doc.m4 @@ -4,7 +4,7 @@ AC_DEFUN([SHAMROCK_CHECK_GNOME_DOC_UTILS], AC_HELP_STRING([--enable-user-help], [Enable building the user-help [[default=auto]]]),, enable_user_help=auto) - if test "x$enable_user_help" = "xauto"; then + if test "x$enable_user_help" = "xauto"; then PKG_CHECK_MODULES(GNOME_DOC_UTILS, gnome-doc-utils, enable_user_help=yes, enable_user_help=no) @@ -12,11 +12,11 @@ AC_DEFUN([SHAMROCK_CHECK_GNOME_DOC_UTILS], PKG_CHECK_MODULES(GNOME_DOC_UTILS, gnome-doc-utils) fi - if test "x$enable_user_help" = "xyes"; then + # GNOME_DOC_INIT sets ENABLE_SK, but if we have disabled + # user docs, then this needs to be defined manually. + AM_CONDITIONAL(ENABLE_SK, false) + if test "x$enable_user_help" = "xyes"; then GNOME_DOC_INIT([$1], enable_user_help=yes, enable_user_help=no) - else - AM_CONDITIONAL(ENABLE_SK, false) - fi - AM_CONDITIONAL(HAVE_GNOME_DOC_UTILS, test "x$enable_user_help" = "xyes") + AM_CONDITIONAL(HAVE_GNOME_DOC_UTILS, test "x$enable_user_help" = "xyes") ])