From a8bd58464cf18a4d19168566714568d229929daa Mon Sep 17 00:00:00 2001
From: Eugeniy Meshcheryakov <eugen@debian.org>
Date: Tue, 5 May 2009 22:45:36 +0200
Subject: Make test example for xmlto more complex, to make it fail on Debian

---
 configure.ac | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 129583e6..50c17d9e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -196,6 +196,9 @@ cat > conftest.$ac_ext << EOF
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
 "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" []>
    <book id="pdffromxml">
+     <bookinfo>
+       <title>test</title>
+     </bookinfo>
    </book>
 EOF
    xmlto pdf conftest.$ac_ext >& /dev/null
-- 
cgit 


From 3f6d0896b990c586667d0de08ac85b18effb0274 Mon Sep 17 00:00:00 2001
From: Eugeniy Meshcheryakov <eugen@debian.org>
Date: Tue, 5 May 2009 22:50:54 +0200
Subject: Remove latex2html detection, it is not used anymore

---
 configure.ac | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 50c17d9e..2a500f49 100644
--- a/configure.ac
+++ b/configure.ac
@@ -164,8 +164,7 @@ AC_ARG_ENABLE([docs],
 AC_CHECK_PROG(have_latex, latex, yes, no)
 AC_CHECK_PROG(have_dvips, dvips, yes, no)
 AC_CHECK_PROG(have_ps2pdf, ps2pdf, yes, no)
-AC_CHECK_PROG(have_latex2html, latex2html, yes, no)
-if test "x${have_latex}${have_dvips}${have_ps2pdf}${have_latex2html}" != "xyesyesyesyes"; then
+if test "x${have_latex}${have_dvips}${have_ps2pdf}" != "xyesyesyes"; then
    if test "$enable_docs" == "yes"; then
       AC_MSG_ERROR([cannot find all tools for building documentation])
    fi
@@ -173,7 +172,7 @@ if test "x${have_latex}${have_dvips}${have_ps2pdf}${have_latex2html}" != "xyesye
     AC_MSG_WARN([will not build documentation, cannot find all tools])
   fi
 fi
-if test "x${have_latex}${have_dvips}${have_ps2pdf}${have_latex2html}" == "xyesyesyesyes" -a "$enable_docs" != "no"; then
+if test "x${have_latex}${have_dvips}${have_ps2pdf}" == "xyesyesyes" -a "$enable_docs" != "no"; then
    building_docs="yes"
 fi
 AM_CONDITIONAL([BUILD_DOCS], [test "$building_docs" == "yes"])
-- 
cgit 


From 023337aaca2d3056437658e3037840b05d3d9a75 Mon Sep 17 00:00:00 2001
From: Eugeniy Meshcheryakov <eugen@debian.org>
Date: Wed, 6 May 2009 01:04:38 +0200
Subject: Fix --enable-refdocs

---
 configure.ac | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 2a500f49..ab315c10 100644
--- a/configure.ac
+++ b/configure.ac
@@ -188,7 +188,17 @@ if test "$building_docs" == "no" -a "$enable_refdocs" == "yes" ; then
    AC_MSG_ERROR([must use --enable-docs with --enable-refdocs])
 fi
 AC_CHECK_PROG(have_xmlto, xmlto, yes, no)
-if test "x${have_xmlto}" == "xyes"; then
+if test "$enable_refdocs" == "yes"; then
+   if test "x${have_xmlto}" != "xyes"; then
+      AC_MSG_ERROR([cannot find xmlto for building reference documentation])
+   fi
+fi
+if test "x${have_xmlto}" == "xyes" -a "$enable_refdocs" != "no" -a "${building_docs}" == "yes"; then
+   building_refdocs="yes"
+fi
+AM_CONDITIONAL([BUILD_REFDOCS], [test "$building_refdocs" == "yes"])
+
+if test "x${building_refdocs}" == "xyes"; then
 AC_MSG_CHECKING([for xmlto pdf support])
 cat > conftest.$ac_ext << EOF
 <?xml version="1.0" encoding="UTF-8"?>
@@ -206,17 +216,10 @@ EOF
       AC_MSG_RESULT([yes])
    else
       AC_MSG_RESULT([no])
+      AC_MSG_WARN([Not building reference documentation in PDF format])
    fi
 fi
-if test "$enable_refdocs" == "yes"; then
-   if test "x${have_xmlto}${have_xmlto_pdf}" != "xyesyes"; then
-      AC_MSG_ERROR([cannot find proper xmlto for building reference documentation])
-   fi
-fi
-if test "x${have_xmlto}${have_xmlto_pdf}" == "xyesyes" -a "$enable_refdocs" != "no" -a "${building_docs}" == "yes"; then
-   building_refdocs="yes"
-fi
-AM_CONDITIONAL([BUILD_REFDOCS], [test "$building_refdocs" == "yes"])
+AM_CONDITIONAL([BUILD_PDFREFDOCS], [test "have_xmlto_pdf" == "yes"])
 
 dnl Handle the option to build the server setup.
 AC_ARG_ENABLE([server],
-- 
cgit