hholzgra Wed Mar 19 12:19:35 2003 EDT
Modified files:
/phpdoc configure.in
Log:
"configure --help" output cleanup and support for additional options
"--with-pear-source" and "--with-extension" so that documentation
parts from PECL and from standalone extensions may be integrated
(work in progress)
Index: phpdoc/configure.in
diff -u phpdoc/configure.in:1.181 phpdoc/configure.in:1.182
--- phpdoc/configure.in:1.181 Mon Feb 10 08:13:51 2003
+++ phpdoc/configure.in Wed Mar 19 12:19:34 2003
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.181 2003/02/10 13:13:51 betz Exp $
+dnl $Id: configure.in,v 1.182 2003/03/19 17:19:34 hholzgra Exp $
dnl autoconf initialisation
AC_INIT()
@@ -23,7 +23,7 @@
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],
+[ --with-php=PATH look for PHP executable needed for helper scripts],
[
if test $withval != "yes"; then
AC_MSG_CHECKING([for php])
@@ -85,7 +85,7 @@
dnl use given argument, if any, else search in path
AC_ARG_WITH(jade,
-[ --with-jade=PATH Look for jade or openjade executable],[
+[ --with-jade=PATH look for jade or openjade executable],[
if test $withval != "yes"; then
AC_MSG_CHECKING([for jade])
if test -x $withval; then
@@ -135,7 +135,7 @@
dnl {{{ check for nsgmls
AC_ARG_WITH(nsgmls,
-[ --with-nsgmls=PATH Look for nsgmls executable],[
+[ --with-nsgmls=PATH look for nsgmls executable],[
if test $withval != "yes"; then
AC_MSG_CHECKING([for nsgmls])
if test -x $withval; then
@@ -176,7 +176,7 @@
dnl use given argument, if any, else search in path
AC_ARG_WITH(xsltproc,
-[ --with-xsltproc=PATH Look for xsltproc],
+[ --with-xsltproc=PATH look for xsltproc],
[
if test $withval != "yes"; then
AC_MSG_CHECKING([for xsltproc])
@@ -219,7 +219,7 @@
dnl use given argument, if any, else search in path
AC_ARG_WITH(xmllint,
-[ --with-xmllint=PATH check for xmllint],
+[ --with-xmllint=PATH check for xmllint],
[
if test $withval != "yes"; then
AC_MSG_CHECKING([for xmllint])
@@ -267,7 +267,7 @@
AC_MSG_CHECKING(for docbook.dsl)
AC_ARG_WITH(dsssl,
-[ --with-dsssl=[DIR] Look for DSSSL stylesheets in the specified directory],
+[ --with-dsssl=[DIR] look for DSSSL stylesheets in the specified directory],
[
if test -f "$withval/html/docbook.dsl" ; then
DOCBOOK_HTML=$withval/html/docbook.dsl
@@ -293,7 +293,7 @@
AC_MSG_CHECKING(for docbook.xsl)
AC_ARG_WITH(xsl,
-[ --with-xsl=[DIR] Look for XSL stylesheets in the specified DIR],
+[ --with-xsl=[DIR] look for XSL stylesheets in the specified DIR],
[
if test -f "$withval/html/docbook.xsl"; then
DOCBOOKXSL_BIGHTML=$withval/html/docbook.xsl
@@ -382,7 +382,7 @@
AC_MSG_CHECKING(for PHP source path)
AC_ARG_WITH(source,
-[ --with-source=[DIR] Look at the specified source directory],
+[ --with-source=[DIR] look at the specified source directory],
[
if test -d "$withval" ; then
PHP_SOURCE=$withval
@@ -400,12 +400,55 @@
dnl }}}
+dnl {{{ check for PEAR sources
+
+AC_MSG_CHECKING(for PEAR source path)
+AC_ARG_WITH(pear,
+[ --with-pear-source=[DIR] look at the specified pear directory],
+[
+ if test -d "$withval" ; then
+ PEAR_SOURCE=$withval
+ else
+ PEAR_SOURCE=$srcdir/../pear
+ fi
+],[
+ PEAR_SOURCE=$srcdir/../pear
+])
+if test ! -d $PEAR_SOURCE/PECL; then
+ PEAR_SOURCE=no
+fi
+AC_MSG_RESULT($PEAR_SOURCE)
+AC_SUBST(PEAR_SOURCE)
+
+dnl }}}
+
+dnl {{{ check for additional extension sources
+
+AC_MSG_CHECKING(for additional PHP extensions)
+AC_ARG_WITH(extension,
+[ --with-extension=[DIR] look at the specified extension directory],
+[
+ AC_MSG_RESULT($withval)
+list=`echo "$withval" | sed -e"s/,/ /g"`
+EXT_SOURCE="";
+for dir in $list; do
+ if test -d "$dir/manual"; then
+ AC_MSG_RESULT([ extension '$dir' ok])
+ EXT_SOURCE="$EXT_SOURCE:$dir"
+ else
+ AC_MSG_WARN([ extension '$dir' ignored])
+ fi
+done
+])
+dnl }}}
+AC_SUBST(EXT_SOURCE)
+
dnl {{{ check for ZendEngine API documentation to include
AC_MSG_CHECKING(for ZendAPI)
AC_ARG_WITH(zendapi,
-[ --with-zendapi=[DIR] Look for ZendAPI documentation in the specified directory],
+[ --with-zendapi=[DIR] look for ZendAPI documentation in the specified
directory],
[
if test -f "$withval/Extending_Zend.xml" ; then
ZENDAPI=$withval
@@ -447,7 +490,7 @@
dnl {{{
AC_MSG_CHECKING(for CSS to use for html docs)
AC_ARG_WITH(htmlcss,
-[ --with-htmlcss=URL Specify a CSS file to include in html docs],
+[ --with-htmlcss=URL specify a CSS file to include in html docs],
[
AC_MSG_RESULT([$withval])
HTMLCSS="(define %stylesheet% \"$withval\")"
@@ -465,7 +508,7 @@
AC_MSG_CHECKING(for chmonly inclusion)
AC_ARG_WITH(chm,
-[ --with-chm=yes Enable Windows HTML Help Edition pages],
+[ --with-chm=yes enable Windows HTML Help Edition pages],
[
if test "$withval" = "yes"; then
CHMENABLED=yes
@@ -498,7 +541,7 @@
PHP_BUILD_DATE=`date '+%Y-%m-%d'`
AC_ARG_WITH(lang,
-[ --with-lang=LANG Choose a language to work with],[
+[ --with-lang=LANG choose a language to work with],[
if test "$withval" = "yes"; then
LANG=en
MANUAL="php_manual_$LANG"
@@ -572,9 +615,10 @@
dnl optionaly reduce margins to save some trees life
+dnl this works is dsssl only for now
AC_MSG_CHECKING(for treesaving)
AC_ARG_WITH(treesaving,
-[ --with-treesaving Save trees by setting pagesize and margins],
+[ --with-treesaving save trees by setting pagesize and margins],
[
TREESAVING="#t";
LEFT_MARGIN="(define %left-margin% 4pi)";
--
PHP Documentation Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
