[banshee] [build] clean up some gnome-doc-utils stuff

[Aaron Bockover <abock src gnome org>]

commit a7b6b4b79d8885af7c46cd47e272acc45ef64f3d
Author: Aaron Bockover <abockover novell com>
Date:   Mon Aug 23 14:24:49 2010 -0400

    [build] clean up some gnome-doc-utils stuff

 Makefile.am                    |    2 --
 autogen.sh                     |   19 +++++++++++--------
 build/Makefile.am              |    4 +++-
 build/m4/shamrock/gnome-doc.m4 |   22 +++++++++++-----------
 help/Makefile.am               |    2 +-
 5 files changed, 26 insertions(+), 23 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 496c2a9..49290dd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -153,7 +153,6 @@ package-po: check-since
 	fi
 
 EXTRA_DIST = \
-	gnome-doc-utils.make \
 	intltool-extract.in \
 	intltool-merge.in \
 	intltool-update.in \
@@ -167,7 +166,6 @@ CLEANFILES = \
 	intltool-merge
 
 DISTCLEANFILES = \
-	gnome-doc-utils.make \
 	*.bak \
 	*~ \
 	*.pidb
diff --git a/autogen.sh b/autogen.sh
index 0e6feed..20e9804 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -64,16 +64,19 @@ check_autotool_version $LIBTOOLIZE 1.4.3
 check_autotool_version intltoolize 0.35.0
 check_autotool_version pkg-config 0.14.0
 
-if [ $(pkg-config --modversion gnome-doc-utils 2> /dev/null) ]; then
-    run gnome-doc-prepare --automake --force
-else
-    echo "gnome-doc-utils not found; user help will not be built"
-    echo "AC_DEFUN([GNOME_DOC_INIT], [AC_MSG_NOTICE([])])" > build/m4/gnome-doc-utils.m4
-    ACLOCAL_FLAGS="-I build/m4 $ACLOCAL_FLAGS"
-    touch gnome-doc-utils.make
+if ! git --help &>/dev/null; then
+	git submodule update --init
 fi
 
-git submodule update --init
+if pkg-config --modversion gnome-doc-utils 2>/dev/null; then
+	run gnome-doc-prepare --automake --force --copy
+	mv gnome-doc-utils.make build/gnome-doc-utils.make
+else
+	echo "AC_DEFUN([GNOME_DOC_INIT], [AC_MSG_NOTICE([])])" > build/m4/gnome-doc-utils.m4
+	ACLOCAL_FLAGS="-I build/m4 $ACLOCAL_FLAGS"
+	rm -f build/gnome-doc-utils.make
+	touch build/gnome-doc-utils.make
+fi
 
 run intltoolize --force --copy
 run $LIBTOOLIZE --force --copy --automake
diff --git a/build/Makefile.am b/build/Makefile.am
index 2d25668..d88b030 100644
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -42,8 +42,10 @@ EXTRA_DIST = \
 	AddinXmlStringExtractor.cs \
 	GObjectIntPtrCtorVerifier.cs \
 	dll-map-makefile-verifier \
-	gconf-schema-rules
+	gconf-schema-rules \
+	gnome-doc-utils.make
 
+DISTCLEANFILES = gnome-doc-utils.make
 CLEANFILES = *.exe *.mdb
 MAINTAINERCLEANFILES = Makefile.in
 
diff --git a/build/m4/shamrock/gnome-doc.m4 b/build/m4/shamrock/gnome-doc.m4
index e76498b..a7a05b5 100644
--- a/build/m4/shamrock/gnome-doc.m4
+++ b/build/m4/shamrock/gnome-doc.m4
@@ -1,20 +1,20 @@
 AC_DEFUN([SHAMROCK_CHECK_GNOME_DOC_UTILS],
 [
-    AC_ARG_ENABLE([user-help],
-           AC_HELP_STRING([--enable-user-help], [Enable building the user-help [[default=auto]]]),,
-           enable_user_help=auto)
+	AC_ARG_ENABLE([user-help],
+			AC_HELP_STRING([--enable-user-help], [Enable building the user-help [[default=auto]]]),,
+			enable_user_help=auto)
 
 	if test "x$enable_user_help" = "xauto"; then
-        PKG_CHECK_MODULES(GNOME_DOC_UTILS,
-            gnome-doc-utils,
-            enable_user_help=yes, enable_user_help=no)
-    elif test "x$enable_user_help" = "xyes"; then
-        PKG_CHECK_MODULES(GNOME_DOC_UTILS, gnome-doc-utils)
-    fi
+		PKG_CHECK_MODULES(GNOME_DOC_UTILS,
+			gnome-doc-utils,
+			enable_user_help=yes, enable_user_help=no)
+	elif test "x$enable_user_help" = "xyes"; then
+		PKG_CHECK_MODULES(GNOME_DOC_UTILS, gnome-doc-utils)
+	fi
 
 	if test "x$enable_user_help" = "xyes"; then
-        GNOME_DOC_INIT([$1], enable_user_help=yes, enable_user_help=no)
-    fi
+		GNOME_DOC_INIT([$1], enable_user_help=yes, enable_user_help=no)
+	fi
 
 	AM_CONDITIONAL(HAVE_GNOME_DOC_UTILS, test "x$enable_user_help" = "xyes")
 ])
diff --git a/help/Makefile.am b/help/Makefile.am
index edaaa1d..b79794d 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,5 +1,5 @@
 if HAVE_GNOME_DOC_UTILS
-include $(top_srcdir)/gnome-doc-utils.make
+include $(top_srcdir)/build/gnome-doc-utils.make
 
 DOC_ID = banshee
 DOC_INCLUDES = legal.xml