cvs: smarty /docs Makefile.in README configure.in

nlopess		Fri Jul 30 06:42:52 2004 EDT

  Modified files:              
    /smarty/docs	Makefile.in README configure.in 
  Log:
  add make test_xml
  this is usefull to detect XML problems
  
http://cvs.php.net/diff.php/smarty/docs/Makefile.in?r1=1.10&r2=1.11&ty=u
Index: smarty/docs/Makefile.in
diff -u smarty/docs/Makefile.in:1.10 smarty/docs/Makefile.in:1.11
--- smarty/docs/Makefile.in:1.10	Thu Jul 29 14:32:04 2004
+++ smarty/docs/Makefile.in	Fri Jul 30 06:42:52 2004
@@ -14,7 +14,7 @@
 #
 
 #
-# $Id: Makefile.in,v 1.10 2004/07/29 18:32:04 nlopess Exp $
+# $Id: Makefile.in,v 1.11 2004/07/30 10:42:52 nlopess Exp $
 #
 
 all: html
@@ -26,6 +26,7 @@
 NSGMLS=@NSGMLS@
 JADE=@JADE@  -D . -wno-idref
 XSLTPROC=@XSLTPROC@
+XMLLINT=@XMLLINT@
 FOP=@FOP@
 XMLDCL=./dtds/dbxml-4.1.2/phpdocxml.dcl
 CATALOG=@CATALOG@
@@ -57,6 +58,8 @@
 test:
 	$(NSGMLS) -i lang-$(LANG) -s $(XMLDCL) manual.xml 
 
+test_xml:
+	$(XMLLINT) --noent --noout --valid manual.xml
 
 revcheck: FORCE
 	$(PHP) -f scripts/revcheck.php $(LANG) > revcheck.html
http://cvs.php.net/diff.php/smarty/docs/README?r1=1.5&r2=1.6&ty=u
Index: smarty/docs/README
diff -u smarty/docs/README:1.5 smarty/docs/README:1.6
--- smarty/docs/README:1.5	Thu Jul 29 14:32:04 2004
+++ smarty/docs/README	Fri Jul 30 06:42:52 2004
@@ -10,6 +10,7 @@
 
 TEST:
  * make test
+ * make test_xml (test for XML validity)
 
 MAKE:
  * make (to make plain html)
http://cvs.php.net/diff.php/smarty/docs/configure.in?r1=1.10&r2=1.11&ty=u
Index: smarty/docs/configure.in
diff -u smarty/docs/configure.in:1.10 smarty/docs/configure.in:1.11
--- smarty/docs/configure.in:1.10	Thu Jul 29 14:37:51 2004
+++ smarty/docs/configure.in	Fri Jul 30 06:42:52 2004
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.10 2004/07/29 18:37:51 nlopess Exp $
+dnl $Id: configure.in,v 1.11 2004/07/30 10:42:52 nlopess Exp $
 
 dnl autoconf initialisation
 AC_INIT()
@@ -240,7 +240,7 @@
   fi
 ],[
   if test -e ../../phpdoc-tools/fop/fop.bat ; then
-    AC_MSG_CHECKING([for xsltproc])
+    AC_MSG_CHECKING([for FOP])
     FOP=../../phpdoc-tools/fop/fop.bat
     AC_MSG_RESULT($FOP)
   else
@@ -252,6 +252,48 @@
   AC_MSG_WARN([no fop binary found, PDF generation work])
 fi
 AC_SUBST(FOP)
+
+dnl }}}
+
+dnl {{{   check for xmllint
+
+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 }}}
 

-- 
Smarty CVS Mailing List (http://cvs.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php