diff --git a/README b/README index d3398b1f..dd7e3ed7 100644 --- a/README +++ b/README @@ -102,8 +102,8 @@ b. Building from Source On Fedora, you will need to run (as root); yum install gtkmm24-devel parted-devel e2fsprogs-devel gettext \ 'perl(XML::Parser)' desktop-file-utils libuuid-devel \ - gnome-doc-utils docbook-dtds rarian-compat intltool \ - gnome-common gcc-c++ + gnome-doc-utils docbook-dtds intltool gnome-common \ + gcc-c++ yum groupinstall 'Development Tools' On openSUSE, these dependencies may be obtained by running the @@ -123,9 +123,13 @@ b. Building from Source the --disable-doc flag: E.g., ./configure --disable-doc - If you wish to build this package for use on a desktop that does not - support scrollkeeper use the --disable-scrollkeeper flag: + Scrollkeeper is needed on GNOME/Gtk 2 desktops to update the OMF + catalog files to allow yelp to display the GParted help manual. On + GNOME/Gtk 3 desktops scrollkeeper in not required. Use can be + explicitly disabled with the --disable-scrollkeeper flag: E.g., ./configure --disable-scrollkeeper + Note that the configure script will automatically disable + scrollkeeper if the scrollkeeper-update command is not found. If you wish to build this package to use native libparted /dev/mapper dmraid support use the --enable-libparted-dmraid flag: diff --git a/configure.ac b/configure.ac index ce6f1224..b6229702 100644 --- a/configure.ac +++ b/configure.ac @@ -348,6 +348,23 @@ fi AM_CONDITIONAL([BUILD_HELP_DOC], [test "x$enable_doc" = xyes]) +dnl GNOME 2 yelp needs scrollkeeper database updates to find installed GNOME help files. +dnl GNOME 3 yelp doesn't need scrollkeeper and its use is deprecated. To avoid requiring +dnl deprecated scrollkeeper on GNOME 3, automatically disable scrollkeeper database +dnl updates when the command is not available. +dnl (See /usr/share/aclocal/gnome-doc-utils.m4 for the GNOME_DOC_INIT macro which has +dnl already parsed the --disable-scrollkeeper option and set enable_scrollkeeper and +dnl ENABLE_SK). +AC_CHECK_PROG([have_scrollkeeper_update], [scrollkeeper-update], yes, no) +AC_MSG_CHECKING([whether to enable scrollkeeper database update]) +if test "$enable_scrollkeeper" = "yes" -a "$have_scrollkeeper_update" = "yes"; then + AC_MSG_RESULT([yes]) +else + enable_scrollkeeper=no + AM_CONDITIONAL([ENABLE_SK], false) + AC_MSG_RESULT([no]) +fi + dnl====================== dnl check whether to use native libparted dmraid support @@ -438,6 +455,7 @@ echo "======================== Final configuration ===========================" echo " Installing into prefix : $prefix" echo "" echo " Build help documentation? : $enable_doc" +echo " Update scrollkeeper database? : $enable_scrollkeeper" echo "" echo " Use native libparted dmraid support? : $enable_libparted_dmraid" echo ""