cvs: peardoc / Makefile.in configure.in
| From: | jim winstead | Date: | Mon, 14 Jan 2002 20:19:32 +0000 |
| Subject: | cvs: peardoc / Makefile.in configure.in | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-1935@lists.php.net to get a copy of this message | ||
jimw Mon Jan 14 15:19:32 2002 EDT
Modified files:
/peardoc Makefile.in configure.in
Log:
find php executable, colorize.php is in $(srcdir)
Index: peardoc/Makefile.in
diff -u peardoc/Makefile.in:1.6 peardoc/Makefile.in:1.7
--- peardoc/Makefile.in:1.6 Mon Jan 14 14:57:17 2002
+++ peardoc/Makefile.in Mon Jan 14 15:19:32 2002
@@ -20,7 +20,7 @@
#
#
-# $Id: Makefile.in,v 1.6 2002/01/14 19:57:17 jimw Exp $
+# $Id: Makefile.in,v 1.7 2002/01/14 20:19:32 jimw Exp $
#
VPATH=@srcdir@
@@ -93,7 +93,7 @@
pearweb/index.php: manual.xml $(PEARWEB_DEPS)
@test -d pearweb || mkdir pearweb
-$(JADE) $(CATALOG) -d $(PEARWEB_STYLESHEET) -V use-output-dir -t sgml $(srcdir)/phpdocxml.dcl
manual.xml
- ./colorize.php pearweb pearweb
+ @PHP@ -Cq $(srcdir)/colorize.php pearweb pearweb
@MANUAL@.txt: @MANUAL@.html
lynx -term=vt100 -nolist -dump file:
pwd/$< > $@
Index: peardoc/configure.in
diff -u peardoc/configure.in:1.5 peardoc/configure.in:1.6
--- peardoc/configure.in:1.5 Sat Dec 29 06:15:48 2001
+++ peardoc/configure.in Mon Jan 14 15:19:32 2002
@@ -1,7 +1,42 @@
-dnl $Id: configure.in,v 1.5 2001/12/29 11:15:48 mj Exp $
+dnl $Id: configure.in,v 1.6 2002/01/14 20:19:32 jimw Exp $
AC_INIT(global.ent)
+dnl use given argument, if any, else search in path
+AC_ARG_WITH(php,
+[ --with-php=PATH Look for PHP executable needed for helper 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
+ AC_PATH_PROGS(PHP,"php php4",no)
+ fi
+],[
+ AC_PATH_PROGS(PHP,"php php4",no)
+]
+)
+if test $PHP = "no"; then
+ AC_MSG_WARN([no PHP binary found])
+else
+ AC_MSG_CHECKING([php version])
+ PHPVERSION=$PHP -qv
+ if test "yes" = echo '<?php echo
phpversion()>3?"yes":"no"; ?>' | $PHP -q; then
+ AC_MSG_RESULT($PHPVERSION ok)
+ else
+ AC_MSG_RESULT($PHPVERSION)
+ AC_MSG_WARN([PHP version 4.0.0 or newer needed])
+ PHP=no
+ fi
+fi
+AC_SUBST(PHP)
dnl AC_MSG_CHECKING(for DocBook doctype)
dnl check_catalog_files() {
dnl for catalog in $@; do