sniper Fri Oct 3 01:24:34 2003 EDT
Modified files:
/php-src configure.in
/TSRM tsrm.m4
/ZendEngine2 Zend.m4
/php-src/ext/dba config.m4
/php-src/ext/filepro config.m4
/php-src/ext/imap config.m4
/php-src/ext/mime_magic config.m4
/php-src/ext/mnogosearch config.m4
/php-src/ext/oci8 config.m4
/php-src/ext/odbc config.m4
/php-src/ext/oracle config.m4
/php-src/sapi/apache2filter config.m4
/php-src/sapi/caudium config.m4
/php-src/sapi/cgi config9.m4
/php-src/sapi/isapi config.m4
/php-src/sapi/milter config.m4
/php-src/sapi/pi3web config.m4
/php-src/sapi/servlet config.m4
Log:
Aligned configure help texts.
Index: php-src/configure.in
diff -u php-src/configure.in:1.466 php-src/configure.in:1.467
--- php-src/configure.in:1.466 Sun Sep 14 05:54:19 2003
+++ php-src/configure.in Fri Oct 3 01:24:16 2003
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.466 2003/09/14 09:54:19 helly Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.467 2003/10/03 05:24:16 sniper Exp $ -*- sh -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -868,7 +868,9 @@
dnl Configuring Zend and TSRM.
dnl -------------------------------------------------------------------------
+PHP_HELP_SEPARATOR([Zend:])
PHP_CONFIGURE_PART(Configuring Zend)
+
LIBZEND_BASIC_CHECKS
LIBZEND_DLSYM_CHECK
LIBZEND_OTHER_CHECKS
@@ -892,6 +894,7 @@
ZEND_EXTRA_LIBS="$LIBS"
unset LIBS LDFLAGS
+PHP_HELP_SEPARATOR([TSRM:])
PHP_CONFIGURE_PART(Configuring TSRM)
TSRM_BASIC_CHECKS
if test "$PHP_THREAD_SAFETY" = "yes"; then
@@ -1111,6 +1114,7 @@
dnl Libtool creation
dnl
+PHP_HELP_SEPARATOR([Libtool:])
PHP_CONFIGURE_PART(Configuring libtool)
LDFLAGS="$LDFLAGS $PHP_AIX_LDFLAGS"
Index: TSRM/tsrm.m4
diff -u TSRM/tsrm.m4:1.14 TSRM/tsrm.m4:1.15
--- TSRM/tsrm.m4:1.14 Sat Oct 5 07:26:17 2002
+++ TSRM/tsrm.m4 Fri Oct 3 01:24:17 2003
@@ -95,14 +95,15 @@
dnl to maintain consistency
AC_ARG_WITH(tsrm-pth,
-[ --with-tsrm-pth[=pth-config] Use GNU Pth.],[
+[ --with-tsrm-pth[=pth-config]
+ Use GNU Pth.],[
TSRM_PTH=$withval
],[
TSRM_PTH=no
])
AC_ARG_WITH(tsrm-st,
-[ --with-tsrm-st],[
+[ --with-tsrm-st Use SGI's State Threads],[
TSRM_ST=$withval
],[
TSRM_ST=no
Index: ZendEngine2/Zend.m4
diff -u ZendEngine2/Zend.m4:1.41 ZendEngine2/Zend.m4:1.42
--- ZendEngine2/Zend.m4:1.41 Sun Sep 7 09:49:15 2003
+++ ZendEngine2/Zend.m4 Fri Oct 3 01:24:18 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: Zend.m4,v 1.41 2003/09/07 13:49:15 stas Exp $
+dnl $Id: Zend.m4,v 1.42 2003/10/03 05:24:18 sniper Exp $
dnl
dnl This file contains Zend specific autoconf functions.
dnl
@@ -98,7 +98,7 @@
AC_DEFUN(LIBZEND_ENABLE_DEBUG,[
AC_ARG_ENABLE(debug,
-[ --enable-debug Compile with debugging symbols],[
+[ --enable-debug Compile with debugging symbols],[
ZEND_DEBUG=$enableval
],[
ZEND_DEBUG=no
@@ -109,15 +109,15 @@
AC_DEFUN(LIBZEND_OTHER_CHECKS,[
AC_ARG_ENABLE(maintainer-zts,
-[ --enable-maintainer-zts Enable thread safety - for code maintainers only],[
+[ --enable-maintainer-zts Enable thread safety - for code maintainers only],[
ZEND_MAINTAINER_ZTS=$enableval
],[
ZEND_MAINTAINER_ZTS=no
])
AC_ARG_ENABLE(inline-optimization,
-[ --disable-inline-optimization If building zend_execute.lo fails, try
- this switch.],[
+[ --disable-inline-optimization
+ If building zend_execute.lo fails, try this switch.],[
ZEND_INLINE_OPTIMIZATION=$enableval
],[
ZEND_INLINE_OPTIMIZATION=yes
@@ -131,7 +131,7 @@
])
AC_ARG_ENABLE(zend-multibyte,
-[ --enable-zend-multibyte Compile with zend multibyte support. ], [
+[ --enable-zend-multibyte Compile with zend multibyte support. ], [
ZEND_MULTIBYTE=$enableval
],[
ZEND_MULTIBYTE=no
Index: php-src/ext/dba/config.m4
diff -u php-src/ext/dba/config.m4:1.55 php-src/ext/dba/config.m4:1.56
--- php-src/ext/dba/config.m4:1.55 Thu Oct 2 06:47:11 2003
+++ php-src/ext/dba/config.m4 Fri Oct 3 01:24:19 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.55 2003/10/02 10:47:11 moriyoshi Exp $
+dnl $Id: config.m4,v 1.56 2003/10/03 05:24:19 sniper Exp $
dnl
dnl Suppose we need FlatFile if no support or only CDB is used.
@@ -393,7 +393,7 @@
])
AC_ARG_WITH(inifile,
-[ --with-inifile DBA: Include INI support],[
+[ --with-inifile DBA: Include INI support],[
if test "$withval" != "no"; then
PHP_DBA_BUILTIN_INI
fi
@@ -414,7 +414,7 @@
dnl FlatFile check must be the last one.
dnl
AC_ARG_WITH(flatfile,
-[ --with-flatfile DBA: Include FlatFile support],[
+[ --with-flatfile DBA: Include FlatFile support],[
if test "$withval" != "no"; then
PHP_DBA_BUILTIN_FLATFILE
fi
Index: php-src/ext/filepro/config.m4
diff -u php-src/ext/filepro/config.m4:1.6 php-src/ext/filepro/config.m4:1.7
--- php-src/ext/filepro/config.m4:1.6 Tue Mar 12 11:17:41 2002
+++ php-src/ext/filepro/config.m4 Fri Oct 3 01:24:21 2003
@@ -1,8 +1,6 @@
dnl
-dnl $Id: config.m4,v 1.6 2002/03/12 16:17:41 sas Exp $
+dnl $Id: config.m4,v 1.7 2003/10/03 05:24:21 sniper Exp $
dnl
-
-AC_ARG_WITH(filepro,[],[enable_filepro=$withval])
PHP_ARG_ENABLE(filepro,whether to enable the bundled filePro support,
[ --enable-filepro Enable the bundled read-only filePro support.])
Index: php-src/ext/imap/config.m4
diff -u php-src/ext/imap/config.m4:1.60 php-src/ext/imap/config.m4:1.61
--- php-src/ext/imap/config.m4:1.60 Thu Oct 2 21:13:44 2003
+++ php-src/ext/imap/config.m4 Fri Oct 3 01:24:22 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.60 2003/10/03 01:13:44 moriyoshi Exp $
+dnl $Id: config.m4,v 1.61 2003/10/03 05:24:22 sniper Exp $
dnl
AC_DEFUN(IMAP_INC_CHK,[if test -r "$i$1/c-client.h"; then
@@ -103,7 +103,7 @@
AC_DEFUN(PHP_IMAP_SSL_CHK, [
AC_ARG_WITH(imap-ssl,
- [ --with-imap-ssl=<DIR> IMAP: Include SSL support. DIR is the OpenSSL install
dir.],[
+ [ --with-imap-ssl=<DIR> IMAP: Include SSL support. DIR is the OpenSSL install
dir.],[
PHP_IMAP_SSL=$withval
],[
PHP_IMAP_SSL=no
Index: php-src/ext/mime_magic/config.m4
diff -u php-src/ext/mime_magic/config.m4:1.10 php-src/ext/mime_magic/config.m4:1.11
--- php-src/ext/mime_magic/config.m4:1.10 Mon Mar 31 14:48:53 2003
+++ php-src/ext/mime_magic/config.m4 Fri Oct 3 01:24:23 2003
@@ -1,10 +1,11 @@
dnl
-dnl $Id: config.m4,v 1.10 2003/03/31 19:48:53 moriyoshi Exp $
+dnl $Id: config.m4,v 1.11 2003/10/03 05:24:23 sniper Exp $
dnl
PHP_ARG_WITH(mime-magic, whether to include mime_magic support,
-[ --with-mime-magic[=FILE] Include mime_magic support. FILE is the optional
- pathname to the magic.mime file.])
+[ --with-mime-magic[=FILE]
+ Include mime_magic support. FILE is the optional
+ pathname to the magic.mime file.])
if test "$PHP_MIME_MAGIC" != "no"; then
Index: php-src/ext/mnogosearch/config.m4
diff -u php-src/ext/mnogosearch/config.m4:1.10 php-src/ext/mnogosearch/config.m4:1.11
--- php-src/ext/mnogosearch/config.m4:1.10 Tue Mar 12 11:24:53 2002
+++ php-src/ext/mnogosearch/config.m4 Fri Oct 3 01:24:24 2003
@@ -1,13 +1,12 @@
dnl
dnl $Source: /usr/repository/php-src/ext/mnogosearch/config.m4,v $
-dnl $Id: config.m4,v 1.10 2002/03/12 16:24:53 sas Exp $
+dnl $Id: config.m4,v 1.11 2003/10/03 05:24:24 sniper Exp $
dnl
PHP_ARG_WITH(mnogosearch,for mnoGoSearch support,
[ --with-mnogosearch[=DIR]
Include mnoGoSearch support. DIR is the mnoGoSearch
- base install directory, defaults to
- /usr/local/mnogosearch.])
+ base install directory, defaults to
/usr/local/mnogosearch.])
if test "$PHP_MNOGOSEARCH" != "no"; then
Index: php-src/ext/oci8/config.m4
diff -u php-src/ext/oci8/config.m4:1.46 php-src/ext/oci8/config.m4:1.47
--- php-src/ext/oci8/config.m4:1.46 Tue Jun 3 08:47:49 2003
+++ php-src/ext/oci8/config.m4 Fri Oct 3 01:24:25 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.46 2003/06/03 12:47:49 edink Exp $
+dnl $Id: config.m4,v 1.47 2003/10/03 05:24:25 sniper Exp $
dnl
AC_DEFUN(PHP_OCI_IF_DEFINED,[
@@ -42,8 +42,7 @@
])
PHP_ARG_WITH(oci8, for Oracle-OCI8 support,
-[ --with-oci8[=DIR] Include Oracle-oci8 support. Default DIR is
- ORACLE_HOME.])
+[ --with-oci8[=DIR] Include Oracle-oci8 support. Default DIR is ORACLE_HOME.])
if test "$PHP_OCI8" != "no"; then
AC_MSG_CHECKING([Oracle Install-Dir])
Index: php-src/ext/odbc/config.m4
diff -u php-src/ext/odbc/config.m4:1.62 php-src/ext/odbc/config.m4:1.63
--- php-src/ext/odbc/config.m4:1.62 Thu Oct 2 21:13:43 2003
+++ php-src/ext/odbc/config.m4 Fri Oct 3 01:24:26 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.62 2003/10/03 01:13:43 moriyoshi Exp $
+dnl $Id: config.m4,v 1.63 2003/10/03 05:24:26 sniper Exp $
dnl
dnl
@@ -212,7 +212,7 @@
if test -z "$ODBC_TYPE"; then
AC_MSG_CHECKING(for Empress support)
AC_ARG_WITH(empress,
-[ --with-empress[=DIR] Include Empress support. DIR is the Empress base
+[ --with-empress[=DIR] Include Empress support. DIR is the Empress base
install directory, defaults to \$EMPRESSPATH.
From PHP4, this option only supports Empress Version
8.60 and above],
Index: php-src/ext/oracle/config.m4
diff -u php-src/ext/oracle/config.m4:1.29 php-src/ext/oracle/config.m4:1.30
--- php-src/ext/oracle/config.m4:1.29 Tue Mar 12 11:26:43 2002
+++ php-src/ext/oracle/config.m4 Fri Oct 3 01:24:26 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.29 2002/03/12 16:26:43 sas Exp $
+dnl $Id: config.m4,v 1.30 2003/10/03 05:24:26 sniper Exp $
dnl
AC_DEFUN(AC_ORACLE_VERSION,[
@@ -26,8 +26,7 @@
])
PHP_ARG_WITH(oracle, for Oracle-ORACLE support,
-[ --with-oracle[=DIR] Include Oracle-oci7 support. Default DIR is
- ORACLE_HOME.])
+[ --with-oracle[=DIR] Include Oracle-oci7 support. Default DIR is ORACLE_HOME.])
if test "$PHP_ORACLE" != "no"; then
AC_MSG_CHECKING([Oracle Install-Dir])
Index: php-src/sapi/apache2filter/config.m4
diff -u php-src/sapi/apache2filter/config.m4:1.35
php-src/sapi/apache2filter/config.m4:1.36
--- php-src/sapi/apache2filter/config.m4:1.35 Wed Jul 16 01:46:36 2003
+++ php-src/sapi/apache2filter/config.m4 Fri Oct 3 01:24:27 2003
@@ -1,10 +1,11 @@
dnl
-dnl $Id: config.m4,v 1.35 2003/07/16 05:46:36 sniper Exp $
+dnl $Id: config.m4,v 1.36 2003/10/03 05:24:27 sniper Exp $
dnl
AC_MSG_CHECKING(for Apache 2.0 filter-module support via DSO through APXS)
AC_ARG_WITH(apxs2filter,
-[ --with-apxs2filter[=FILE] EXPERIMENTAL: Build shared Apache 2.0 module. FILE is
the optional
+[ --with-apxs2filter[=FILE]
+ EXPERIMENTAL: Build shared Apache 2.0 module. FILE is the
optional
pathname to the Apache apxs tool; defaults to "apxs".],[
if test "$withval" = "yes"; then
APXS=apxs
Index: php-src/sapi/caudium/config.m4
diff -u php-src/sapi/caudium/config.m4:1.11 php-src/sapi/caudium/config.m4:1.12
--- php-src/sapi/caudium/config.m4:1.11 Thu Mar 7 09:19:50 2002
+++ php-src/sapi/caudium/config.m4 Fri Oct 3 01:24:28 2003
@@ -1,11 +1,11 @@
dnl
-dnl $Id: config.m4,v 1.11 2002/03/07 14:19:50 sas Exp $
+dnl $Id: config.m4,v 1.12 2003/10/03 05:24:28 sniper Exp $
dnl
RESULT=no
AC_MSG_CHECKING(for Caudium support)
AC_ARG_WITH(caudium,
-[ --with-caudium=DIR Build PHP as a Pike module for use with Caudium
+[ --with-caudium[=DIR] Build PHP as a Pike module for use with Caudium
DIR is the Caudium server dir, with the default value
/usr/local/caudium/server.],
[
Index: php-src/sapi/cgi/config9.m4
diff -u php-src/sapi/cgi/config9.m4:1.10 php-src/sapi/cgi/config9.m4:1.11
--- php-src/sapi/cgi/config9.m4:1.10 Mon Sep 8 09:10:10 2003
+++ php-src/sapi/cgi/config9.m4 Fri Oct 3 01:24:29 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config9.m4,v 1.10 2003/09/08 13:10:10 sniper Exp $
+dnl $Id: config9.m4,v 1.11 2003/10/03 05:24:29 sniper Exp $
dnl
AC_ARG_ENABLE(cgi,
@@ -12,9 +12,9 @@
AC_ARG_ENABLE(force-cgi-redirect,
[ --enable-force-cgi-redirect
- Enable the security check for internal server
- redirects. You should use this if you are
- running the CGI version with Apache.],
+ Enable the security check for internal server
+ redirects. You should use this if you are
+ running the CGI version with Apache.],
[
PHP_FORCE_CGI_REDIRECT=$enableval
],[
@@ -42,7 +42,8 @@
])
AC_ARG_ENABLE(path-info-check,
-[ --disable-path-info-check If this is disabled, paths such as
+[ --disable-path-info-check
+ If this is disabled, paths such as
/info.php/test?a=b will fail to work.],
[
PHP_ENABLE_PATHINFO_CHECK=$enableval
Index: php-src/sapi/isapi/config.m4
diff -u php-src/sapi/isapi/config.m4:1.14 php-src/sapi/isapi/config.m4:1.15
--- php-src/sapi/isapi/config.m4:1.14 Thu Mar 7 09:19:52 2002
+++ php-src/sapi/isapi/config.m4 Fri Oct 3 01:24:31 2003
@@ -1,11 +1,11 @@
dnl
-dnl $Id: config.m4,v 1.14 2002/03/07 14:19:52 sas Exp $
+dnl $Id: config.m4,v 1.15 2003/10/03 05:24:31 sniper Exp $
dnl
RESULT=no
AC_MSG_CHECKING(for Zeus ISAPI support)
AC_ARG_WITH(isapi,
-[ --with-isapi=DIR Build PHP as an ISAPI module for use with Zeus.],
+[ --with-isapi[=DIR] Build PHP as an ISAPI module for use with Zeus.],
[
if test "$withval" = "yes"; then
ZEUSPATH=/usr/local/zeus # the default
Index: php-src/sapi/milter/config.m4
diff -u php-src/sapi/milter/config.m4:1.5 php-src/sapi/milter/config.m4:1.6
--- php-src/sapi/milter/config.m4:1.5 Sun Dec 1 08:44:22 2002
+++ php-src/sapi/milter/config.m4 Fri Oct 3 01:24:31 2003
@@ -1,10 +1,10 @@
dnl
-dnl $Id: config.m4,v 1.5 2002/12/01 13:44:22 phanto Exp $
+dnl $Id: config.m4,v 1.6 2003/10/03 05:24:31 sniper Exp $
dnl
AC_MSG_CHECKING(for Milter support)
AC_ARG_WITH(milter,
-[ --with-milter=DIR Build PHP as Milter application],[
+[ --with-milter[=DIR] Build PHP as Milter application],[
if test "$withval" = "yes"; then
if test -f /usr/lib/libmilter.a ; then
MILTERPATH=/usr/lib
Index: php-src/sapi/pi3web/config.m4
diff -u php-src/sapi/pi3web/config.m4:1.8 php-src/sapi/pi3web/config.m4:1.9
--- php-src/sapi/pi3web/config.m4:1.8 Fri Oct 11 23:10:04 2002
+++ php-src/sapi/pi3web/config.m4 Fri Oct 3 01:24:32 2003
@@ -1,12 +1,12 @@
dnl
-dnl $Id: config.m4,v 1.8 2002/10/12 03:10:04 sniper Exp $
+dnl $Id: config.m4,v 1.9 2003/10/03 05:24:32 sniper Exp $
dnl
RESULT=no
AC_MSG_CHECKING(for Pi3Web support)
AC_ARG_WITH(pi3web,
-[ --with-pi3web=DIR Build PHP as Pi3Web module],
+[ --with-pi3web[=DIR] Build PHP as Pi3Web module],
[
if test "$withval" != "no"; then
if test "$withval" = "yes"; then
Index: php-src/sapi/servlet/config.m4
diff -u php-src/sapi/servlet/config.m4:1.15 php-src/sapi/servlet/config.m4:1.16
--- php-src/sapi/servlet/config.m4:1.15 Thu Oct 2 06:47:12 2003
+++ php-src/sapi/servlet/config.m4 Fri Oct 3 01:24:33 2003
@@ -1,10 +1,10 @@
dnl
-dnl $Id: config.m4,v 1.15 2003/10/02 10:47:12 moriyoshi Exp $
+dnl $Id: config.m4,v 1.16 2003/10/03 05:24:33 sniper Exp $
dnl
AC_MSG_CHECKING(for Servlet support)
AC_ARG_WITH(servlet,
-[ --with-servlet[=DIR] Include servlet support. DIR is the base install
+[ --with-servlet[=DIR] Include servlet support. DIR is the base install
directory for the JSDK. This SAPI prereqs the
java extension must be built as a shared dl.],
[
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
