Scrollkeeper in Gnucash Docs

[John Ralls]

On Oct 5, 2009, at 10:22 AM, Derek Atkins wrote:

>
> Then I guess we might as well turn it off.
>

OK. Since
"svn: Commit blocked by pre-commit hook (exit code 1) with output:
/home/svn/repo/hooks/commit-access-control.pl: user `jralls' does not  
have permission to commit to these paths:
   gnucash-docs/trunk
   gnucash-docs/trunk/configure.in
   gnucash-docs/trunk/xmldocs.make"

The patch follows.

Regards,
John Ralls



Index: xmldocs.make
===================================================================
--- xmldocs.make        (revision 18372)
+++ xmldocs.make        (working copy)
@@ -74,10 +74,15 @@
  CLEANFILES = omf_timestamp $(docname)/*.html

  # If the following file is in a subdir (like help/) you need to add  
that to the path
+if ENABLE_SK
  include $(top_srcdir)/omf.make
+OMF="omf"
+OMF_DATA_HOOK=install-data-hook-omf
+UNINSTALL_OMF=uninstall-local-omf
+endif

  html: all convert-html copy-pics copy-style
-all: omf
+all: ${OMF}

  #$(docname).xml: $(entities)
  #      -ourdir=`pwd`;  \
@@ -107,9 +112,9 @@
           done


-install-data-hook: install-data-hook-omf
+install-data-hook: ${OMF_DATA_HOOK}

-uninstall-local: uninstall-local-doc uninstall-local-omf
+uninstall-local: uninstall-local-doc ${UNINSTALL_OMF}

  uninstall-local-doc:
         -if test "$(figdir)"; then \
Index: configure.in
===================================================================
--- configure.in        (revision 18372)
+++ configure.in        (working copy)
@@ -16,15 +16,15 @@
  dnl ====================================
  dnl = Begin tests for scrollkeeper
  dnl ====================================
-AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no)
-if test x$SCROLLKEEPER_CONFIG = xno; then
-  AC_MSG_ERROR(Couldn't find scrollkeeper-config. Please install the  
scrollkeeper package: http://scrollkeeper.sourceforge.net)
-fi
  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)
+fi
  dnl ====================================
  dnl = End tests for scrollkeeper
  dnl ====================================