[balsa/gtk3] Simplify configuring with gnome-doc-utils

[Peter Bloomfield <PeterB src gnome org>]

commit d6370d5e00fb6eb87fce6a017ad0817f65d73947
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Tue Apr 23 20:54:26 2013 -0400

    Simplify configuring with gnome-doc-utils
    
        * Makefile.am: use HAVE_GNOME_DOC_UTILS instead of
        BUILD_WITH_G_D_U.
        * configure.ac: make sure HAVE_GNOME_DOC_UTILS and ENABLE_SK are
        defined.

 ChangeLog       |    7 +++++++
 Makefile.am     |    2 +-
 configure.ac    |   23 ++---------------------
 doc/ChangeLog   |    5 +++++
 doc/Makefile.am |    2 +-
 5 files changed, 16 insertions(+), 23 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 14a0e9e..1043abe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-04-23  Peter Bloomfield
+
+       * Makefile.am: use HAVE_GNOME_DOC_UTILS instead of
+       BUILD_WITH_G_D_U.
+       * configure.ac: make sure HAVE_GNOME_DOC_UTILS and ENABLE_SK are
+       defined.
+
 2013-04-22  Peter Bloomfield
 
        More efficient use of space in header widget
diff --git a/Makefile.am b/Makefile.am
index 2245ff8..3323405 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,7 +30,7 @@ balsa_extra_dist =            \
        intltool-update.in      \
        mkinstalldirs
 
-if BUILD_WITH_G_D_U
+if HAVE_GNOME_DOC_UTILS
 balsa_g_d_u_extra_dist = gnome-doc-utils.make
 endif
 
diff --git a/configure.ac b/configure.ac
index fddd7c9..f77efd9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -226,28 +226,9 @@ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
 # scrollkeeper.
 #
 
-AC_PATH_PROG(gdtool, gnome-doc-tool, no)
-if test "$gdtool" = no; then
-with_g_d_u=no
-else
-   AC_MSG_CHECKING([whether we have gnome-doc-utils])
-   if $PKG_CONFIG --exists gnome-doc-utils; then
-       with_g_d_u=yes
-   else
-       with_g_d_u=no
-   fi
-   AC_MSG_RESULT($with_g_d_u)
-fi
-
-
-AM_CONDITIONAL([BUILD_WITH_G_D_U], [test $with_g_d_u = "yes"])
-
-if test $with_g_d_u = yes ; then
-GNOME_DOC_INIT
-AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[true])
-else
 AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[false])
-fi
+AM_CONDITIONAL([ENABLE_SK],[false])
+m4_ifdef([GNOME_DOC_INIT],[GNOME_DOC_INIT],[echo 'No gnome-doc-utils'])
 
 # glib-genmarshal
 #
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 3e9bd96..6290ada 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-23  Peter Bloomfield
+
+       * Makefile.am: use HAVE_GNOME_DOC_UTILS instead of
+       BUILD_WITH_G_D_U.
+
 2010-07-25 Stanislav Brabec
 
        * Makefile.am: remove reference to unused address-book-start.png
diff --git a/doc/Makefile.am b/doc/Makefile.am
index d5f417b..d57366c 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,4 @@
-if BUILD_WITH_G_D_U
+if HAVE_GNOME_DOC_UTILS
 include $(top_srcdir)/gnome-doc-utils.make
 dist-hook: doc-dist-hook
 DOC_MODULE = balsa