[balsa/gtk3] Port to new documentation infrastructure

[Peter Bloomfield <PeterB src gnome org>]

commit 1d7bed6ecc52f762a4dc683c795aba32a908d3d6
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Sat Apr 27 08:33:11 2013 -0400

    Port to new documentation infrastructure
    
        * .gitignore: change as in <URL:https://live.gnome.org/
        GnomeGoals/NewDocumentationInfrastructure>
        * Makefile.am: ditto.
        * autogen.sh: remove gnome-doc-tool code.
        * bootstrap.sh: ditto.
        * configure.ac: test `which yelp-build` to detect yelp-tools
        package, warn if not found, but continue to configure with
        documentation disabled.

 .gitignore      |    1 -
 ChangeLog       |   13 +++++++++++++
 Makefile.am     |   10 ++--------
 autogen.sh      |    8 --------
 bootstrap.sh    |    9 ---------
 configure.ac    |   19 ++++++++++++++-----
 doc/ChangeLog   |    6 ++++++
 doc/Makefile.am |   18 +++++-------------
 8 files changed, 40 insertions(+), 44 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7a66e4d..1d3341b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,7 +30,6 @@ config.status
 config.sub
 configure
 depcomp
-gnome-doc-utils.make
 install-sh
 intltool-extract.in
 intltool-merge.in
diff --git a/ChangeLog b/ChangeLog
index e58be63..42362e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2013-04-27  Peter Bloomfield
+
+       Port to new documentation infrastructure
+
+       * .gitignore: change as in <URL:https://live.gnome.org/
+       GnomeGoals/NewDocumentationInfrastructure>
+       * Makefile.am: ditto.
+       * autogen.sh: remove gnome-doc-tool code.
+       * bootstrap.sh: ditto.
+       * configure.ac: test `which yelp-build` to detect yelp-tools
+       package, warn if not found, but continue to configure with
+       documentation disabled.
+
 2013-04-25  Peter Bloomfield  <peter w500 bellsouth net>
 
        Improve path checking in the first-time assistant
diff --git a/Makefile.am b/Makefile.am
index 3323405..3d89587 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,13 +30,8 @@ balsa_extra_dist =           \
        intltool-update.in      \
        mkinstalldirs
 
-if HAVE_GNOME_DOC_UTILS
-balsa_g_d_u_extra_dist = gnome-doc-utils.make
-endif
-
 EXTRA_DIST =                   \
-    $(balsa_extra_dist)                \
-    $(balsa_g_d_u_extra_dist)
+    $(balsa_extra_dist)
 
 if BUILD_WITH_GTKSOURCEVIEW
 gtksourceviewdir = $(BALSA_DATA_PREFIX)/gtksourceview-2.0
@@ -45,8 +40,7 @@ gtksourceview_DATA = balsa-mail.lang          \
 endif
 
 DISTCLEANFILES = $(desktop_DATA) $(server_DATA) \
-       intltool-extract intltool-merge intltool-update \
-       gnome-doc-utils.make
+       intltool-extract intltool-merge intltool-update
 
 
 dist-hook: balsa.spec
diff --git a/autogen.sh b/autogen.sh
index dfe227e..c82d914 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,13 +5,6 @@ glib-gettextize --force --copy || exit 1
 echo "running intltoolize..."
 [ -d m4 ] || mkdir m4
 intltoolize --copy --force --automake || exit 1
-echo "Running gnome-doc-prepare --force - ignore errors."
-if gnome-doc-prepare --force > /dev/null 2>&1; then
-   :
-else
-    test -L gnome-doc-utils.make && rm gnome-doc-utils.make
-    touch gnome-doc-utils.make
-fi
 echo "Running libtoolize..."
 libtoolize --force || exit 1
 echo "Running aclocal..."
@@ -24,4 +17,3 @@ echo "Running automake..."
 automake --gnu --add-missing --copy || exit 1
 echo "Running configure $* ..."
 exec ./configure "$@"
-gnome-doc-tool -V > /dev/null 2>&1 || echo "gnome-doc-utils required to make dist"
diff --git a/bootstrap.sh b/bootstrap.sh
index 3aa99dd..af8fe9b 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -5,13 +5,6 @@ glib-gettextize --force --copy || exit 1
 echo "running intltoolize..."
 [ -d m4 ] || mkdir m4
 intltoolize --copy --force --automake || exit 1
-echo "Running gnome-doc-prepare --force - ignore errors."
-if gnome-doc-prepare --force > /dev/null 2>&1; then
-   :
-else
-    test -L gnome-doc-utils.make && rm gnome-doc-utils.make
-    touch gnome-doc-utils.make
-fi
 echo "Running libtoolize..."
 libtoolize --force || exit 1
 echo "Running aclocal..."
@@ -24,5 +17,3 @@ echo "Running automake..."
 automake --gnu --add-missing --copy || exit 1
 echo "Running configure $* ..."
 ./configure "$@"
-gnome-doc-tool -V > /dev/null 2>&1 || echo "gnome-doc-utils required to make dist"
-
diff --git a/configure.ac b/configure.ac
index bcedfb1..6c1c4da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -225,12 +225,21 @@ AC_PROG_LN_S
 #
 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
 
-# scrollkeeper.
+# yelp
 #
-
-AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[false])
-AM_CONDITIONAL([ENABLE_SK],[false])
-m4_ifdef([GNOME_DOC_INIT],[GNOME_DOC_INIT],[echo 'No gnome-doc-utils'])
+AC_MSG_CHECKING([for Yelp tool])
+YELPTOOL=`which yelp-build 2>/dev/null`
+if test -z $YELPTOOL; then
+    AC_MSG_RESULT([no])
+    echo "*** The tools to build the documentation are not found."
+    echo "    To build it, please install the yelp-tools package."
+    echo "    Continuing with configure. ****"
+    AM_CONDITIONAL([HAVE_YELPTOOL], [false])
+else
+    AC_MSG_RESULT([yes])
+    YELP_HELP_INIT
+    AM_CONDITIONAL([HAVE_YELPTOOL], [true])
+fi
 
 # glib-genmarshal
 #
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 6290ada..d4f617d 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,9 @@
+2013-04-27  Peter Bloomfield  <peter w500 bellsouth net>
+
+       reviewed by: <delete if not using a buddy>
+
+       * Makefile.am:
+
 2013-04-23  Peter Bloomfield
 
        * Makefile.am: use HAVE_GNOME_DOC_UTILS instead of
diff --git a/doc/Makefile.am b/doc/Makefile.am
index d57366c..35f97a9 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,10 +1,7 @@
-if HAVE_GNOME_DOC_UTILS
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
-DOC_MODULE = balsa
-DOC_ENTITIES =
-DOC_INCLUDES =
-DOC_FIGURES = figures/address-book-ldap.png                    \
+if HAVE_YELPTOOL
+ YELP_HELP_RULES@
+HELP_ID      = balsa
+HELP_MEDIA   = figures/address-book-ldap.png                   \
              figures/address-book-modify.png                   \
              figures/address-book.png                          \
              figures/address-book-vcard.png                    \
@@ -21,12 +18,7 @@ DOC_FIGURES = figures/address-book-ldap.png                  \
              figures/newmsg-window-toolbar.png                 \
              figures/preferences-window.png                    \
              figures/spell-check.png
-DOC_LINGUAS = de es fr sl
-else
-# gnome-doc-utils is not obligatory but the old documentation style
-# is not supported any more.
-# SUBDIRS = C de
-# EXTRA_DIST = omf.make xmldocs.make
+HELP_LINGUAS = de es fr sl
 
 doc-dist-hook: