[orca] More make distcheck work

[Joanmarie Diggs <joanied src gnome org>]

commit f3a4169647de490945ea41bd02ed98d5fc585b68
Author: Joanmarie Diggs <joanmarie diggs gmail com>
Date:   Thu Dec 16 08:47:38 2010 -0500

    More make distcheck work

 .gitignore                    |    1 +
 Makefile.am                   |    5 ++++-
 configure.in                  |    3 +++
 help/Makefile.am              |    2 ++
 m4/{.cvsignore => .gitignore} |    0
 5 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b5c22aa..05e29a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@ config.sub
 configure
 debug.out
 depcomp
+gnome-doc-utils.make
 install-sh
 intltool-extract.in
 intltool-extract
diff --git a/Makefile.am b/Makefile.am
index de4ff5f..06ba494 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,8 @@
 SUBDIRS = docs icons po src help
 
-DISTCHECK_CONFIGURE_FLAGS = --enable-pydoc
+DISTCHECK_CONFIGURE_FLAGS =     \
+	--enable-pydoc          \
+	--disable-scrollkeeper
 
 DISTCLEANFILES =                \
 	gnome-doc-utils.make	\
@@ -27,6 +29,7 @@ desktop_DATA     = $(desktop_in_files:.desktop.in=.desktop)
 EXTRA_DIST =                \
 	$(desktop_in_files) \
 	$(icon_DATA)        \
+	gnome-doc-utils.make \
 	ChangeLog           \
 	MAINTAINERS
 
diff --git a/configure.in b/configure.in
index 55b9594..9ebc807 100644
--- a/configure.in
+++ b/configure.in
@@ -4,6 +4,9 @@ m4_define([orca_micro_version], [4pre])
 m4_define([orca_version],
           [orca_major_version.orca_minor_version.orca_micro_version])
 
+AC_CONFIG_MACRO_DIR([m4])
+GNOME_DOC_INIT
+
 AC_INIT([orca],
         [orca_version],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=orca],
diff --git a/help/Makefile.am b/help/Makefile.am
index b001671..e5e079a 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/gnome-doc-utils.make
+
 DOC_ID = orca
 DOC_FIGURES = \
 	figures/orca-logo.png
diff --git a/m4/.cvsignore b/m4/.gitignore
similarity index 100%
rename from m4/.cvsignore
rename to m4/.gitignore