r18387 - gnucash-docs/trunk - Make --disable-scrollkeeper actually do so:

[John Ralls]

Author: jralls
Date: 2009-10-22 11:56:35 -0400 (Thu, 22 Oct 2009)
New Revision: 18387
Trac: http://svn.gnucash.org/trac/changeset/18387

Modified:
   gnucash-docs/trunk/configure.in
   gnucash-docs/trunk/xmldocs.make
Log:
Make --disable-scrollkeeper actually do so:
Rearrange configure so that scrollkeeper checks aren't made if --disable-scrollkeeper is set.
Supress generating open-source metafiles (.omf) for scrollkeeper if --disable-scrollkeeper is set.


Modified: gnucash-docs/trunk/configure.in
===================================================================
--- gnucash-docs/trunk/configure.in	2009-10-18 23:48:37 UTC (rev 18386)
+++ gnucash-docs/trunk/configure.in	2009-10-22 15:56:35 UTC (rev 18387)
@@ -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 ====================================

Modified: gnucash-docs/trunk/xmldocs.make
===================================================================
--- gnucash-docs/trunk/xmldocs.make	2009-10-18 23:48:37 UTC (rev 18386)
+++ gnucash-docs/trunk/xmldocs.make	2009-10-22 15:56:35 UTC (rev 18387)
@@ -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 \