From 4947251b3fd97eb71ec630919e43bcce4787e0ac Mon Sep 17 00:00:00 2001 From: =?utf8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?= =?utf8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= Date: Wed, 3 Apr 2013 21:35:52 +0400 Subject: [PATCH] Don't need docbook2html anymore, need xsltproc --- m4/gst-doc.m4 | 28 ++-------------------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/m4/gst-doc.m4 b/m4/gst-doc.m4 index cf83184..5d3f0fd 100644 --- a/m4/gst-doc.m4 +++ b/m4/gst-doc.m4 @@ -20,34 +20,10 @@ AC_DEFUN([AG_GST_DOCBOOK_CHECK], dnl check for docbook tools AC_CHECK_PROG(HAVE_DOCBOOK2PS, docbook2ps, yes, no) - AC_CHECK_PROG(HAVE_DOCBOOK2HTML, docbook2html, yes, no) + AC_CHECK_PROG(HAVE_XSLTPROC, xsltproc, yes, no) AC_CHECK_PROG(HAVE_JADETEX, jadetex, yes, no) AC_CHECK_PROG(HAVE_PS2PDF, ps2pdf, yes, no) - # -V option appeared in 0.6.10 - docbook2html_min_version=0.6.10 - if test "x$HAVE_DOCBOOK2HTML" != "xno"; then - docbook2html_version=`docbook2html --version` - AC_MSG_CHECKING([docbook2html version ($docbook2html_version) >= $docbook2html_min_version]) - if perl -w < \$min_version_major) || - ((\$docbook2html_version_major == \$min_version_major) && - (\$docbook2html_version_minor >= \$min_version_minor)) || - ((\$docbook2html_version_major == \$min_version_major) && - (\$docbook2html_version_minor >= \$min_version_minor) && - (\$docbook2html_version_micro >= \$min_version_micro))) - ? 0 : 1); -EOF - then - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - HAVE_DOCBOOK2HTML=no - fi - fi - dnl check if we can process docbook stuff AS_DOCBOOK(have_docbook=yes, have_docbook=no) @@ -60,7 +36,7 @@ EOF AC_CHECK_PROG(HAVE_EPSTOPDF, epstopdf, yes, no) dnl check if we can generate HTML - if test "x$HAVE_DOCBOOK2HTML" = "xyes" && \ + if test "x$HAVE_XSLTPROC" = "xyes" && \ test "x$enable_docbook" = "xyes" && \ test "x$HAVE_XMLLINT" = "xyes"; then DOC_HTML=yes -- 2.7.4