2002-06-11 Lutz M�ller <lutz@users.sourceforge.net>

* m4/documentation.m4: Fix checks for xmlto-[html,pdf,man,ps].


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@4629 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Lutz Mueller
2002-06-11 08:30:54 +00:00
parent 0d020518a8
commit b04832414e
2 changed files with 25 additions and 6 deletions

View File

@@ -1,3 +1,7 @@
2002-06-11 Lutz Müller <lutz@users.sourceforge.net>
* m4/documentation.m4: Fix checks for xmlto-[html,pdf,man,ps].
2002-06-06 Lutz Müller <lutz@users.sourceforge.net>
Patch by Patrick Mansfield <patman@aracnet.com>:

View File

@@ -136,6 +136,10 @@ dnl ------------------------------------------------------------------------
manual_msg="no (http://cyberelk.net/tim/xmlto/)"
try_xmlto=true
have_xmlto=false
have_xmltohtml=false
have_xmltoman=false
have_xmltopdf=false
have_xmltops=false
AC_ARG_WITH(xmlto, [ --without-xmlto Don't use xmlto],[
if test x$withval = xno; then
try_xmlto=false
@@ -143,14 +147,25 @@ AC_ARG_WITH(xmlto, [ --without-xmlto Don't use xmlto],[
if $try_xmlto; then
AC_CHECK_PROG(have_xmlto,xmlto,true,false)
fi
AM_CONDITIONAL(XMLTO, $have_xmlto)
if $have_xmlto; then
AM_CONDITIONAL(XMLTOHTML,[xmlto --help | grep html > /dev/null 2>&1])
AM_CONDITIONAL(XMLTOMAN,[xmlto --help | grep man > /dev/null 2>&1])
dnl pdf and ps not working yet
AM_CONDITIONAL(XMLTOPDF,[xmlto --help | grep pdf > /dev/null 2>&1])
AM_CONDITIONAL(XMLTOPS,[xmlto --help | grep ps > /dev/null 2>&1])
if xmlto --help | grep html > /dev/null 2>&1; then
have_xmltohtml=true
fi
if xmlto --help | grep man > /dev/null 2>&1; then
have_xmltoman=true
fi
if xmlto --help | grep pdf > /dev/null 2>&1; then
have_xmltopdf=true
fi
if xmlto --help | grep ps > /dev/null 2>&1; then
have_xmltops=true
fi
fi
AM_CONDITIONAL(XMLTO, $have_xmlto)
AM_CONDITIONAL(XMLTOHTML,$have_xmltohtml)
AM_CONDITIONAL(XMLTOMAN,$have_xmltoman)
AM_CONDITIONAL(XMLTOPDF,$have_xmltopdf)
AM_CONDITIONAL(XMLTOPS,$have_xmltops)
# create list of supported formats
xxx=""