[gmime/gmime-2-4] Fixed docbook converter checks and usage.

[Jeffrey Stedfast <fejj src gnome org>]

commit 6df352caf5b437c8ec47151be85837fd8effb3ea
Author: Jeffrey Stedfast <fejj gnome org>
Date:   Sun Jan 8 11:18:54 2012 -0500

    Fixed docbook converter checks and usage.
    
    2012-01-08  Jeffrey Stedfast  <fejj gnome org>
    
    	Fix for bug #667070
    
    	* configure.in: Fixed Docbook checks for the html and pdf
    	* converters.
    
    	* docs/tutorial/Makefile.am: Use the DB2HTML and DB2PDF
    	* variables.

 ChangeLog                 |   11 ++++++++++-
 configure.in              |    3 ++-
 docs/tutorial/Makefile.am |    8 ++++----
 3 files changed, 16 insertions(+), 6 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 1c8fe0b..7ba96d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,17 @@
+2012-01-08  Jeffrey Stedfast  <fejj gnome org>
+
+	Fix for bug #667070
+
+	* configure.in: Fixed Docbook checks for the html and pdf converters.
+
+	* docs/tutorial/Makefile.am: Use the DB2HTML and DB2PDF variables.
+
 2012-01-05  Jeffrey Stedfast  <jeff xamarin com>
 
 	Fixes for bug #667137.
 
-	* tests/Makefile.am: If any tests fail, exit with an error to abort make.
+	* tests/Makefile.am: If any tests fail, exit with an error to
+	abort make.
 
 	* tests/testsuite.c (testsuite_exit): Simply return
 	total_errors.
diff --git a/configure.in b/configure.in
index 5e382b8..d53e09a 100644
--- a/configure.in
+++ b/configure.in
@@ -132,7 +132,8 @@ dnl ************************************
 
 GTK_DOC_CHECK([1.8])
 
-AC_CHECK_PROG(DB2HTML, db2html, true, false)
+AC_CHECK_PROG([DB2HTML], [db2html docbook2html], true, false)
+AC_CHECK_PROG([DB2PDF], [db2pdf docbook2pdf], true, false)
 AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML)
 
 dnl NOTE: We need to use a separate automake conditional for this
diff --git a/docs/tutorial/Makefile.am b/docs/tutorial/Makefile.am
index 3768f7f..801e127 100644
--- a/docs/tutorial/Makefile.am
+++ b/docs/tutorial/Makefile.am
@@ -6,24 +6,24 @@ html:
 if HAVE_DOCBOOK
 	if test -w $(srcdir); then \
 	  (cd $(srcdir); \
-	   db2html gmime-tut.sgml; \
+	   $(DB2HTML) gmime-tut.sgml; \
 	   test -d html && rm -r html; \
 	   mv gmime-tut html); \
 	fi
 else
 	echo "***"
-	echo "*** Warning: Tutorial not built"
+	echo "*** Warning: HTML version of the tutorial not built"
 	echo "***"
 endif
 
 pdf:
 if HAVE_DOCBOOK
 	if test -w $(srcdir); then \
-	  (cd $(srcdir); db2pdf gmime-tut.sgml); \
+	  (cd $(srcdir); $(DB2PDF) gmime-tut.sgml); \
 	fi
 else
 	echo "***"
-	echo "*** Warning: Tutorial not built"
+	echo "*** Warning: Pdf version of the tutorial not built"
 	echo "***"
 endif