gnucash-docs master: Fix scrollkeeper detection

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-docs/commit/47c4a89f (commit)
	from  https://github.com/Gnucash/gnucash-docs/commit/fbde1bbf (commit)



commit 47c4a89f346fcff8ca7d80bc216a575fa09c66c6
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Mar 30 09:59:38 2014 -0700

    Fix scrollkeeper detection
    
    Use AC_ARG_WITH instead of AC_ARG_ENABLE, a more correct choice. Default
    behavior now will use Scrollkeeper (or Rarian-compat) if it's available,
    won't even try if --without-scrollkeeper is passed to configure, and
    will error out if --with-scrollkeeper is passed but scrollkeeper-config
    isn't found.

diff --git a/configure.ac b/configure.ac
index c913bab..6eb884a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,15 +17,19 @@ AC_SUBST(SCROLLKEEPER_BUILD_REQUIRED)
 dnl ====================================
 dnl = Begin tests for scrollkeeper
 dnl ====================================
-AC_ARG_ENABLE([scrollkeeper],
-	[AC_HELP_STRING([--disable-scrollkeeper],
-			[do not make updates to the scrollkeeper database])],,
-	enable_scrollkeeper=yes)
-AM_CONDITIONAL(ENABLE_SK, test "x$enable_scrollkeeper" = "xyes")
-AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no)
-if (test "x$enable_scrollkeeper" = "xyes") && (test x$SCROLLKEEPER_CONFIG = xno); then
-  AC_MSG_ERROR(Couldn't find scrollkeeper-config. Please install the scrollkeeper package: http://scrollkeeper.sourceforge.net)
+SCROLLKEEPER_CONFIG=no
+AC_ARG_WITH([scrollkeeper],
+	[AC_HELP_STRING([--with-scrollkeeper],
+			[do not make updates to the scrollkeeper database (default=check)])],
+	[], [with_scrollkeeper=check])
+if test x$with_scrollkeeper != "xno"; then
+   AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config, no)
+   if (test "x$with_scrollkeeper" = "xyes") && (test x$SCROLLKEEPER_CONFIG = xno); then
+      AC_MSG_ERROR(Couldn't find scrollkeeper-config. Please install the scrollkeeper package: http://scrollkeeper.sourceforge.net or rarian: http://rarian.freedesktop.org and link the rarian executables to their scrollkeeper equivalents.)
+   fi
 fi
+AM_CONDITIONAL(ENABLE_SK, test "x$SCROLLKEEPER_CONFIG" = "xyes")
+
 dnl ====================================
 dnl = End tests for scrollkeeper
 dnl ====================================



Summary of changes:
 configure.ac | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)