cvs: php-gtk-doc / configure.in

jmoore		Fri Aug 10 08:14:12 2001 EDT

  Modified files:              
    /php-gtk-doc	configure.in 
  Log:
  Add support for xsltproc to configure.in, saxon will still work if xsltproc isnt found, Ill add a --with-saxon which can override this at some point..
  
  
Index: php-gtk-doc/configure.in
diff -u php-gtk-doc/configure.in:1.5 php-gtk-doc/configure.in:1.6
--- php-gtk-doc/configure.in:1.5	Sat Jun 30 16:00:03 2001
+++ php-gtk-doc/configure.in	Fri Aug 10 08:14:11 2001
@@ -15,24 +15,29 @@
 # +----------------------------------------------------------------------+
 
 #
-# $Id: configure.in,v 1.5 2001/06/30 20:00:03 jmoore Exp $
+# $Id: configure.in,v 1.6 2001/08/10 12:14:11 jmoore Exp $
 #
 
 AC_INIT(global.ent)
 
-AC_PATH_PROG(SAXON, saxon, no)
-if test "$SAXON" = "no"; then
-    AC_PATH_PROG(JAVA, java, no)
-    if test "$JAVA" = "no"; then
-        AC_MSG_ERROR(unable to locate either Saxon or Java)
-    else
-        AC_MSG_CHECKING(for Saxon.jar)
-        if echo $CLASSPATH | grep "saxon.jar" > /dev/null; then
-            AC_MSG_RESULT("yes")
-            SAXON="$JAVA com.icl.saxon.StyleSheet"
-            AC_SUBST(SAXON)
+AC_PATH_PROG(XSLTPROC, xsltproc, no)
+if test "$XSLTPROC" = "no"
+then
+    AC_PATH_PROG(SAXON, saxon, no)
+    if test "$SAXON" = "no"; then
+        AC_PATH_PROG(JAVA, java, no)
+        if test "$JAVA" = "no"; then
+            AC_MSG_ERROR(unable to locate either Saxon or Java)
         else
-            AC_MSG_ERROR(unable to locate saxon.jar in your classpath)
+            AC_MSG_CHECKING(for Saxon.jar)
+            if echo $CLASSPATH | grep "saxon.jar" > /dev/null; then
+                AC_MSG_RESULT("yes")
+                SAXON="$JAVA com.icl.saxon.StyleSheet"
+                AC_SUBST(SAXON)
+		ENDTEXT="Please ensure you have copied Makefile.saxon to Makefile.in and rerun configure to build with saxon"
+            else
+	        AC_MSG_ERROR(unable to locate saxon.jar in your classpath)
+            fi
         fi
     fi
 fi
@@ -157,3 +162,4 @@
 stylesheets/xsl/update.xsl)
 
 chmod +x scripts/genchapterents.php
+echo $ENDTEXT