cvs: peardoc / Makefile.in configure.in

techtonik Tue Sep 13 14:03:24 2005 EDT Modified files: /peardoc configure.in Makefile.in Log: + test_xml target and xmllint autodetection http://cvs.php.net/diff.php/peardoc/configure.in?r1=1.18&r2=1.19&ty=u Index: peardoc/configure.in diff -u peardoc/configure.in:1.18 peardoc/configure.in:1.19 --- peardoc/configure.in:1.18 Fri Aug 5 16:06:18 2005 +++ peardoc/configure.in Tue Sep 13 14:03:20 2005 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.18 2005/08/05 20:06:18 techtonik Exp $ +dnl $Id: configure.in,v 1.19 2005/09/13 18:03:20 techtonik Exp $ dnl peardoc autoconf initialisation AC_INIT(global.ent) @@ -119,6 +119,50 @@ dnl }}} +dnl {{{ check for xmllint +dnl use given argument, if any, else search in path + +AC_ARG_WITH(xmllint, +[ --with-xmllint=PATH check for xmllint], +[ + if test $withval != "yes"; then + AC_MSG_CHECKING([for xmllint]) + if test -x $withval -a -f $withval + then + XMLLINT=$withval + AC_MSG_RESULT($XMLLINT) + else + XMLLINT=no + AC_MSG_RESULT(no) + AC_MSG_ERROR([$withval: no xmllint binary found]) + fi + else + if test -e ../phpdoc-tools/libxml/xmllint.exe ; then + AC_MSG_CHECKING([for xmllint]) + XSLTPROC=../phpdoc-tools/libxml/xmllint.exe + AC_MSG_RESULT($XMLLINT) + else + AC_PATH_PROG(XMLLINT,"xmllint",no) + fi + fi +],[ + if test -e ../phpdoc-tools/libxml/xmllint.exe ; then + AC_MSG_CHECKING([for xmllint]) + XMLLINT=../phpdoc-tools/libxml/xmllint.exe + AC_MSG_RESULT($XMLLINT) + else + AC_PATH_PROG(XMLLINT,"xmllint",no) + fi +] +) +if test $XMLLINT = "no"; then + AC_MSG_WARN([no xmllint binary found, XML Validation won't work]) +fi +AC_SUBST(XMLLINT) + +dnl }}} + + dnl AC_MSG_CHECKING(for DocBook doctype) dnl check_catalog_files() { dnl for catalog in $@; do http://cvs.php.net/diff.php/peardoc/Makefile.in?r1=1.7&r2=1.8&ty=u Index: peardoc/Makefile.in diff -u peardoc/Makefile.in:1.7 peardoc/Makefile.in:1.8 --- peardoc/Makefile.in:1.7 Sat Aug 6 09:21:10 2005 +++ peardoc/Makefile.in Tue Sep 13 14:03:20 2005 @@ -14,7 +14,7 @@ # | Martin Jansen <mj@php.net> | # +----------------------------------------------------------------------+ # -# $Id: Makefile.in,v 1.7 2005/08/06 13:21:10 techtonik Exp $ +# $Id: Makefile.in,v 1.8 2005/09/13 18:03:20 techtonik Exp $ # VPATH=@srcdir@ @@ -24,6 +24,7 @@ JADE=@SP_OPTIONS@ @JADE@ -wno-idref NSGMLS=@SP_OPTIONS@ @NSGMLS@ PHP=@PHP@ +XMLLINT=@XMLLINT@ CATALOG=@CATALOG@ @@ -118,6 +119,10 @@ test_man_gen: manual.xml $(NSGMLS) -wno-idref -i lang-$(LANG) -s $(srcdir)/phpdocxml.dcl $< +# test errors with xmllint +test_xml: manual.xml + $(XMLLINT) --noent --noout --valid manual.xml + clean: rm -rf html pearweb rm -f .manual.xml