From 040b993dd5e2661b26ddfc7f02ac1bc9988c4929 Mon Sep 17 00:00:00 2001
From: Zsolt Foldvari <zfoldvar@users.sourceforge.net>
Date: Thu, 22 May 2008 18:44:31 +0000
Subject: [PATCH] #0002168: get rid of dependency and mention of
 gnome-doc-utils and scrollkepper. Thanks Alex!

svn: r10754
---
 INSTALL        | 1 -
 Makefile.am    | 4 +---
 configure.in   | 8 --------
 m4/Makefile.am | 1 -
 4 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/INSTALL b/INSTALL
index 7be61f62b..9000422d5 100644
--- a/INSTALL
+++ b/INSTALL
@@ -35,7 +35,6 @@ to install without being root.
 The latter is possible, but you should supply additional arguments to
 autogen or configure:
    --with-mime-dir=$HOME/.local/share/mime
-   --disable-scrollkeeper
 Most likely, such local install will also need some prefix with write
 permissions for you:
    --prefix=$HOME/my_gramps_path
diff --git a/Makefile.am b/Makefile.am
index 015dea8b4..004509c9b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@ EXTRA_DIST = \
 	config.rpath autogen.sh \
 	FAQ COPYING \
 	intltool-extract.in intltool-merge.in intltool-update.in \
-	config.sub config.guess gnome-doc-utils.make
+	config.sub config.guess
 
 bin_SCRIPTS = gramps
 
@@ -18,8 +18,6 @@ distuninstallcheck_listfiles = find . -type -f -print | grep -E -v '/(globs|magi
 DISTCLEANFILES = intltool-extract intltool-merge intltool-update \
 	gnome-doc-utils.make
 
-DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
-
 gramps: gramps.sh
 	cp gramps.sh gramps
 
diff --git a/configure.in b/configure.in
index a23698afd..608753d4b 100644
--- a/configure.in
+++ b/configure.in
@@ -10,7 +10,6 @@ AC_CONFIG_SRCDIR(configure.in)
 AM_INIT_AUTOMAKE([1.6.3 foreign])
 
 AC_CONFIG_MACRO_DIR([m4])
-GNOME_DOC_INIT
 
 RELEASE=0.SVN$(svnversion -n .)
 dnl RELEASE=0beta
@@ -30,13 +29,6 @@ AC_PROG_INTLTOOL
 
 AM_SHARED_MIME
 AM_PACKAGER
-dnl This is a hack to disable scrollkeeper update when in the packager mode.
-dnl It may not seem good to purists, since we're defining
-dnl ENABLE_SK_{TRUE,FALSE} twice, but I cannot see any other way
-dnl without tweaking the gnome-doc-utils macros manually.
-dnl So, scrollkeeper update is enabled when it would normally be,
-dnl *provided* this is not the packager mode. Packager mode cancels it.
-AM_CONDITIONAL(ENABLE_SK, test "x$packager_mode" = "xfalse" -a "x$enable_scrollkeeper" = "xyes")
 AC_SUBST(RELEASE)
 AC_SUBST(VERSIONSTRING)
 
diff --git a/m4/Makefile.am b/m4/Makefile.am
index d323e2446..d00f4ff46 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -2,7 +2,6 @@ EXTRA_DIST = \
 	codeset.m4 \
 	gettext.m4 \
 	glibc21.m4 \
-	gnome-doc-utils.m4 \
 	iconv.m4 \
 	intltool.m4 \
 	isc-posix.m4 \