betz            Mon Feb 10 08:13:51 2003 EDT

  Modified files:              
    /phpdoc     configure.in 
  Log:
  check for xmllint, win support for xsltproc/xmllint
  
Index: phpdoc/configure.in
diff -u phpdoc/configure.in:1.180 phpdoc/configure.in:1.181
--- phpdoc/configure.in:1.180   Sun Feb  9 01:17:10 2003
+++ phpdoc/configure.in Mon Feb 10 08:13:51 2003
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.180 2003/02/09 06:17:10 moriyoshi Exp $
+dnl $Id: configure.in,v 1.181 2003/02/10 13:13:51 betz Exp $
 
 dnl autoconf initialisation
 AC_INIT()
@@ -173,7 +173,7 @@
 dnl }}}
 
 dnl {{{   check for xsltproc
-dnl use given argument, if any, else search in path 
+dnl use given argument, if any, else search in path
 
 AC_ARG_WITH(xsltproc,
 [  --with-xsltproc=PATH        Look for xsltproc],
@@ -187,19 +187,74 @@
     else
       XSLTPROC=no
       AC_MSG_RESULT(no)
-      AC_MSG_ERROR([$withval: no xsltproc binary found])
+      AC_MSG_ERROR([$withval: not an executable file])
     fi
   else
-    AC_PATH_PROG(XSLTPROC,"xsltproc",no)
+    if test -e ../phpdoc-tools/libxml/xsltproc.exe ; then
+      AC_MSG_CHECKING([for xsltproc])
+      XSLTPROC=../phpdoc-tools/libxml/xsltproc.exe
+      AC_MSG_RESULT($XSLTPROC)
+    else
+      AC_PATH_PROG(XSLTPROC,"xsltproc",no)
+    fi
   fi
 ],[
-  AC_PATH_PROGS(XSLTPROC,"xsltproc",no)
+  if test -e ../phpdoc-tools/libxml/xsltproc.exe ; then
+    AC_MSG_CHECKING([for xsltproc])
+    XSLTPROC=../phpdoc-tools/libxml/xsltproc.exe
+    AC_MSG_RESULT($XSLTPROC)
+  else
+    AC_PATH_PROG(XSLTPROC,"xsltproc",no)
+  fi
 ]
 )
 if test $XSLTPROC = "no"; then
   AC_MSG_WARN([no xsltproc binary found, XSL Transformations won't work])
 fi
 AC_SUBST(XSLTPROC)
+
+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 }}}
 



-- 
PHP Documentation Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to