gui Tue Jan 13 05:57:06 2004 EDT
Modified files:
/livedocs configure.in build-ops.in build.sh
Log:
PHP binary autodetection added
Index: livedocs/configure.in
diff -u livedocs/configure.in:1.11 livedocs/configure.in:1.12
--- livedocs/configure.in:1.11 Mon Jan 12 14:09:11 2004
+++ livedocs/configure.in Tue Jan 13 05:57:06 2004
@@ -1,9 +1,52 @@
## A configure script
-## $Id: configure.in,v 1.11 2004/01/12 19:09:11 nlopess Exp $
+## $Id: configure.in,v 1.12 2004/01/13 10:57:06 gui Exp $
AC_PREREQ(2.13)
AC_INIT(livedoc.css)
+AC_ARG_WITH(php,[ --with-php[=PATH] Look for PHP executable needed for
livedocs scripts],
+[
+ if test $withval != "yes"; then
+ AC_MSG_CHECKING([for php])
+ if test -x $withval; then
+ PHP=$withval
+ AC_MSG_RESULT($PHP)
+ else
+ PHP=no
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([$withval: not an executable file])
+ fi
+ else
+ if test -e ../phpdoc-tools/php.bat ; then
+ AC_MSG_CHECKING([for php])
+ PHP=../phpdoc-tools/php.bat
+ AC_MSG_RESULT($PHP)
+ else
+ AC_PATH_PROG(PHP,"php",no)
+ if test $PHP = "no"; then
+ AC_PATH_PROG(PHP4,"php4",no)
+ PHP=$PHP4
+ fi
+ fi
+ fi
+],[
+ if test -e ../phpdoc-tools/php.bat ; then
+ AC_MSG_CHECKING([for php])
+ PHP=../phpdoc-tools/php.bat
+ AC_MSG_RESULT($PHP)
+ else
+ AC_PATH_PROG(PHP,"php",no)
+ if test $PHP = "no"; then
+ AC_PATH_PROG(PHP4,"php4",no)
+ PHP=$PHP4
+ fi
+ fi
+]
+)
+if test $PHP = "no"; then
+ AC_MSG_ERROR([no PHP binary found])
+fi
+
AC_ARG_WITH(build-log,[ --with-build-log[=FILE] Log file
[default=/var/log/livedocs-index]],
[BUILDLOG="$withval"],
[BUILDLOG="/var/log/livedocs-index"])
Index: livedocs/build-ops.in
diff -u livedocs/build-ops.in:1.3 livedocs/build-ops.in:1.4
--- livedocs/build-ops.in:1.3 Wed Jun 18 18:18:38 2003
+++ livedocs/build-ops.in Tue Jan 13 05:57:06 2004
@@ -1,5 +1,6 @@
#!/bin/sh
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
Index: livedocs/build.sh
diff -u livedocs/build.sh:1.15 livedocs/build.sh:1.16
--- livedocs/build.sh:1.15 Mon Jul 28 18:55:03 2003
+++ livedocs/build.sh Tue Jan 13 05:57:06 2004
@@ -25,12 +25,12 @@
date
xsltproc ${LIVEDOCS}/toc.xsl ${PHPDOC}/manual.xml >
${GENDIR}/toc-ugly.xml
xmllint --format ${GENDIR}/toc-ugly.xml > ${GENDIR}/toc.xml
- php ${LIVEDOCS}/mktoc.php ${GENDIR}/toc.xml > ${GENDIR}/toc-insert.sql
+ ${PHP} ${LIVEDOCS}/mktoc.php ${GENDIR}/toc.xml >
${GENDIR}/toc-insert.sql
fi
echo -n "Making index for $i: "
date
- php ${LIVEDOCS}/mkindex.php ${PHPDOC} $i ${GENDIR}
+ ${PHP} ${LIVEDOCS}/mkindex.php ${PHPDOC} $i ${GENDIR}
mv ${GENDIR}/livedoc-idx.$i.sqlite ${OUTPUTDIR}
# create output dir
mkdir -p ${OUTPUTDIR}/$i
