beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

build: Fix error during configure if gnome-doc-utils is not installed

Browse source 
Always set the ENABLE_SK conditional, so that it is defined even if
GNOME_DOC_INIT is not called. Fixes issue #198.
This commit is contained in:
Bertrand Lorentz 2011-06-06 20:35:05 +02:00
parent 903691f990
commit 1c98367ad1
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
build/m4/shamrock/gnome-doc.m4
View file

@ -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")
])