[nautilus-python] Fixed build tools and gtk-doc switch

[Adam Plumb <adamplumb src gnome org>]

commit 62c7209d66270e2c95399b01814d9ddddaf50553
Author: Adam Plumb <adamplumb gmail com>
Date:   Fri May 21 12:27:28 2010 -0400

    Fixed build tools and gtk-doc switch

 Makefile.am      |    4 +++-
 configure.in     |   43 ++++++++++++++++++++-----------------------
 docs/Makefile.am |    2 +-
 3 files changed, 24 insertions(+), 25 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index ab2541a..d653f2a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = src examples
 
-if ENABLE_DOCS
+if ENABLE_GTK_DOC
 SUBDIRS += docs
 endif
 
@@ -9,4 +9,6 @@ pkgconfig_DATA = nautilus-python.pc
 
 EXTRA_DIST = nautilus-python.pc.in
 
+if ENABLE_GTK_DOC
 DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
+endif
diff --git a/configure.in b/configure.in
index 3b3603d..401b077 100644
--- a/configure.in
+++ b/configure.in
@@ -25,6 +25,9 @@ dnl Check for pkgconfig first
 AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, yes, no)
 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
 
+dnl Check for gtk-doc
+GTK_DOC_CHECK(1.9)
+
 dnl Give error and exit if we don't have pkgconfig
 if test "x$HAVE_PKGCONFIG" = "xno"; then
   AC_MSG_ERROR(you need to have pkgconfig installed !)
@@ -72,28 +75,6 @@ NAUTILUS_LIBDIR=`$PKG_CONFIG --variable=libdir libnautilus-extension`
 AC_SUBST(NAUTILUS_LIBDIR)
 AC_DEFINE_UNQUOTED(NAUTILUS_LIBDIR, "$NAUTILUS_LIBDIR", [Nautilus libdir])
 
-dnl Building documentation
-AC_ARG_ENABLE(docs,
-  AC_HELP_STRING([--disable-docs], [Disable documentation building]),,
-  enable_docs=yes)
-if test "${enable_docs}" != no; then
-  dnl Check for xsltproc
-  AC_PATH_PROG([XSLTPROC], [xsltproc])
-  if test -z "$XSLTPROC"; then
-    enable_docs=no
-  fi
-fi
-
-if test x$enable_docs = xyes; then
-   if ! $PKG_CONFIG "pygobject-2.0 >= 2.11.3"; then
-       AC_MSG_WARN([pygobject-2.0 < 2.11.3; disabling generation of docs])
-       enable_docs=no
-   fi
-fi
-
-AM_CONDITIONAL(ENABLE_DOCS, test x$enable_docs != xno)
-
-
 dnl ---------------------------------
 dnl Get nautilus extensions directory
 dnl ---------------------------------
@@ -101,7 +82,17 @@ NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extensio
 AC_SUBST(NAUTILUS_EXTENSION_DIR)
 AC_DEFINE_UNQUOTED(NAUTILUS_EXTENSION_DIR, "$NAUTILUS_EXTENSION_DIR", [Nautilus' extensions directory])
 
-GTK_DOC_CHECK(1.4)
+dnl ---------------------------------
+dnl Check for gtk-doc dependencies
+dnl ---------------------------------
+if test "${enable_gtk_doc}" != no; then
+    dnl Check for xsltproc
+    AC_PATH_PROG([XSLTPROC], [xsltproc])
+    if test -z "$XSLTPROC"; then
+        echo " disabling generation of docs"
+        enable_gtk_doc=no
+    fi
+fi
 
 AC_OUTPUT([
   Makefile
@@ -112,3 +103,9 @@ AC_OUTPUT([
   docs/reference/entities.docbook
 ])
 
+echo
+echo " nautilus-python $VERSION"
+echo
+echo "    Nautilus Prefix: ${prefix}"
+echo "      Documentation: ${enable_gtk_doc}"
+echo
diff --git a/docs/Makefile.am b/docs/Makefile.am
index c78b824..b2b9c6e 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -73,7 +73,7 @@ REFERENCE_DEPS = 	\
 
 $(HTML_DATA): build_stamp
 
-if ENABLE_DOCS
+if ENABLE_GTK_DOC
 
 reference/builddate.xml: $(REFERENCE_DEPS)
 	$(PYTHON) -c 'import datetime; print datetime.date.today()' > $@