From 2dfed48c99035cd8094299cf53df3208a6fcb077 Mon Sep 17 00:00:00 2001 From: foobar Date: Fri, 3 Oct 2003 05:26:30 +0000 Subject: [PATCH] MFH: Aligned configure help texts. --- TSRM/tsrm.m4 | 5 +++-- configure.in | 4 ++++ ext/cyrus/config.m4 | 2 +- ext/dba/config.m4 | 4 ++-- ext/filepro/config.m4 | 2 -- ext/imap/config.m4 | 2 +- ext/mcve/config.m4 | 2 +- ext/mime_magic/config.m4 | 5 +++-- ext/mnogosearch/config.m4 | 3 +-- ext/oci8/config.m4 | 3 +-- ext/odbc/config.m4 | 2 +- ext/oracle/config.m4 | 3 +-- ext/xml/config.m4 | 2 +- ext/xmlrpc/config.m4 | 4 ++-- ext/xslt/config.m4 | 8 ++++---- sapi/apache2filter/config.m4 | 3 ++- sapi/caudium/config.m4 | 2 +- sapi/cgi/config9.m4 | 9 +++++---- sapi/isapi/config.m4 | 2 +- sapi/pi3web/config.m4 | 2 +- sapi/servlet/config.m4 | 2 +- 21 files changed, 37 insertions(+), 34 deletions(-) diff --git a/TSRM/tsrm.m4 b/TSRM/tsrm.m4 index f9f9e4dcd2..291b7f2e4e 100644 --- a/TSRM/tsrm.m4 +++ b/TSRM/tsrm.m4 @@ -95,14 +95,15 @@ dnl For the thread implementations, we always use --with-* 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 diff --git a/configure.in b/configure.in index cf3b77e3c6..74d86f7361 100644 --- a/configure.in +++ b/configure.in @@ -860,7 +860,9 @@ fi dnl Configuring Zend and TSRM. dnl ------------------------------------------------------------------------- +PHP_HELP_SEPARATOR([Zend:]) PHP_CONFIGURE_PART(Configuring Zend) + LIBZEND_BASIC_CHECKS LIBZEND_DLSYM_CHECK LIBZEND_OTHER_CHECKS @@ -884,6 +886,7 @@ fi 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 @@ -1103,6 +1106,7 @@ dnl dnl Libtool creation dnl +PHP_HELP_SEPARATOR([Libtool:]) PHP_CONFIGURE_PART(Configuring libtool) LDFLAGS="$LDFLAGS $PHP_AIX_LDFLAGS" diff --git a/ext/cyrus/config.m4 b/ext/cyrus/config.m4 index 340514911c..04202cd489 100644 --- a/ext/cyrus/config.m4 +++ b/ext/cyrus/config.m4 @@ -3,7 +3,7 @@ dnl $Id$ dnl PHP_ARG_WITH(cyrus, for cyrus imap support, -[ --with-cyrus[=dir] Include Cyrus IMAP support]) +[ --with-cyrus[=DIR] Include Cyrus IMAP support]) if test "$PHP_CYRUS" != "no"; then found_cyrus=no diff --git a/ext/dba/config.m4 b/ext/dba/config.m4 index aa95e530e8..8e6131f209 100644 --- a/ext/dba/config.m4 +++ b/ext/dba/config.m4 @@ -393,7 +393,7 @@ AC_DEFUN(PHP_DBA_BUILTIN_INI,[ ]) 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 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 diff --git a/ext/filepro/config.m4 b/ext/filepro/config.m4 index 13f02c2125..6222bfba2f 100644 --- a/ext/filepro/config.m4 +++ b/ext/filepro/config.m4 @@ -2,8 +2,6 @@ dnl dnl $Id$ 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.]) diff --git a/ext/imap/config.m4 b/ext/imap/config.m4 index 5531d506b1..ceefb0d04a 100644 --- a/ext/imap/config.m4 +++ b/ext/imap/config.m4 @@ -103,7 +103,7 @@ AC_DEFUN(PHP_IMAP_KRB_CHK, [ AC_DEFUN(PHP_IMAP_SSL_CHK, [ AC_ARG_WITH(imap-ssl, - [ --with-imap-ssl= IMAP: Include SSL support. DIR is the OpenSSL install dir.],[ + [ --with-imap-ssl= IMAP: Include SSL support. DIR is the OpenSSL install dir.],[ PHP_IMAP_SSL=$withval ],[ PHP_IMAP_SSL=no diff --git a/ext/mcve/config.m4 b/ext/mcve/config.m4 index 8f9a9e313e..ba99e500ab 100644 --- a/ext/mcve/config.m4 +++ b/ext/mcve/config.m4 @@ -14,7 +14,7 @@ if test "$PHP_MCVE" != "no"; then AC_MSG_ERROR([MCVE: OpenSSL check failed. Please check config.log for more information.]) ]) else - AC_MSG_RESULT([If configure fails, try adding --with-openssl-dir=DIR]) + AC_MSG_RESULT([If configure fails, try adding --with-openssl-dir=]) fi case "$PHP_MCVE" in diff --git a/ext/mime_magic/config.m4 b/ext/mime_magic/config.m4 index b47b1ba97b..1682399501 100644 --- a/ext/mime_magic/config.m4 +++ b/ext/mime_magic/config.m4 @@ -3,8 +3,9 @@ dnl $Id$ 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 diff --git a/ext/mnogosearch/config.m4 b/ext/mnogosearch/config.m4 index d029412440..d127ce6702 100644 --- a/ext/mnogosearch/config.m4 +++ b/ext/mnogosearch/config.m4 @@ -6,8 +6,7 @@ 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 diff --git a/ext/oci8/config.m4 b/ext/oci8/config.m4 index 09b9d70078..69fe4466b2 100644 --- a/ext/oci8/config.m4 +++ b/ext/oci8/config.m4 @@ -42,8 +42,7 @@ AC_DEFUN(AC_OCI8_VERSION,[ ]) 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]) diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4 index de94db3f37..ecc28e731d 100644 --- a/ext/odbc/config.m4 +++ b/ext/odbc/config.m4 @@ -212,7 +212,7 @@ fi 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], diff --git a/ext/oracle/config.m4 b/ext/oracle/config.m4 index d3283e18d3..fdd5276ccd 100644 --- a/ext/oracle/config.m4 +++ b/ext/oracle/config.m4 @@ -26,8 +26,7 @@ AC_DEFUN(AC_ORACLE_VERSION,[ ]) 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]) diff --git a/ext/xml/config.m4 b/ext/xml/config.m4 index 2767976527..e72e0828ff 100644 --- a/ext/xml/config.m4 +++ b/ext/xml/config.m4 @@ -14,7 +14,7 @@ PHP_ARG_ENABLE(xml,whether to enable XML support, [ --disable-xml Disable XML support using bundled expat lib], yes) PHP_ARG_WITH(expat-dir, external libexpat install dir, -[ --with-expat-dir=DIR XML: external libexpat install dir], no, no) +[ --with-expat-dir= XML: external libexpat install dir], no, no) if test "$PHP_XML" = "yes"; then AC_DEFINE(HAVE_LIBEXPAT, 1, [ ]) diff --git a/ext/xmlrpc/config.m4 b/ext/xmlrpc/config.m4 index 7530ee31ad..3b950f0347 100644 --- a/ext/xmlrpc/config.m4 +++ b/ext/xmlrpc/config.m4 @@ -11,10 +11,10 @@ PHP_ARG_WITH(xmlrpc, for XMLRPC-EPI support, [ --with-xmlrpc[=DIR] Include XMLRPC-EPI support.]) PHP_ARG_WITH(expat-dir, libexpat dir for XMLRPC-EPI, -[ --with-expat-dir=DIR XMLRPC-EPI: libexpat dir for XMLRPC-EPI.],yes,no) +[ --with-expat-dir= XMLRPC-EPI: libexpat dir for XMLRPC-EPI.],yes,no) PHP_ARG_WITH(iconv-dir, iconv dir for XMLRPC-EPI, -[ --with-iconv-dir=DIR XMLRPC-EPI: iconv dir for XMLRPC-EPI.],yes,no) +[ --with-iconv-dir= XMLRPC-EPI: iconv dir for XMLRPC-EPI.],yes,no) if test "$PHP_XMLRPC" != "no"; then diff --git a/ext/xslt/config.m4 b/ext/xslt/config.m4 index a69f9f0352..4edabe678e 100644 --- a/ext/xslt/config.m4 +++ b/ext/xslt/config.m4 @@ -10,16 +10,16 @@ PHP_ARG_ENABLE(xslt, whether to enable xslt support, [ --enable-xslt Enable xslt support.]) PHP_ARG_WITH(xslt-sablot, for XSLT Sablotron backend, -[ --with-xslt-sablot=DIR XSLT: Enable the sablotron backend.], no, no) +[ --with-xslt-sablot= XSLT: Enable the sablotron backend.], no, no) PHP_ARG_WITH(expat-dir, for libexpat dir for Sablotron XSL support, -[ --with-expat-dir=DIR XSLT: libexpat dir for Sablotron.], no, no) +[ --with-expat-dir= XSLT: libexpat dir for Sablotron.], no, no) PHP_ARG_WITH(iconv-dir, for iconv dir for Sablotron XSL support, -[ --with-iconv-dir=DIR XSLT: iconv dir for Sablotron.], no, no) +[ --with-iconv-dir= XSLT: iconv dir for Sablotron.], no, no) PHP_ARG_WITH(sablot-js, for JavaScript for Sablotron XSL support, -[ --with-sablot-js=DIR XSLT: enable JavaScript support for Sablotron.], no, no) +[ --with-sablot-js= XSLT: enable JavaScript support for Sablotron.], no, no) if test "$PHP_XSLT" != "no"; then diff --git a/sapi/apache2filter/config.m4 b/sapi/apache2filter/config.m4 index 6b547d799e..178299e2bc 100644 --- a/sapi/apache2filter/config.m4 +++ b/sapi/apache2filter/config.m4 @@ -4,7 +4,8 @@ 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 diff --git a/sapi/caudium/config.m4 b/sapi/caudium/config.m4 index a4f76db1b6..6d5e4bbc19 100644 --- a/sapi/caudium/config.m4 +++ b/sapi/caudium/config.m4 @@ -5,7 +5,7 @@ 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.], [ diff --git a/sapi/cgi/config9.m4 b/sapi/cgi/config9.m4 index 2b54b47431..2fbad1fdc1 100644 --- a/sapi/cgi/config9.m4 +++ b/sapi/cgi/config9.m4 @@ -12,9 +12,9 @@ AC_ARG_ENABLE(cgi, 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(fastcgi, ]) 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 diff --git a/sapi/isapi/config.m4 b/sapi/isapi/config.m4 index ece730cef9..8e0c4bc11f 100644 --- a/sapi/isapi/config.m4 +++ b/sapi/isapi/config.m4 @@ -5,7 +5,7 @@ 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 diff --git a/sapi/pi3web/config.m4 b/sapi/pi3web/config.m4 index 5b1ec78140..325aac2447 100644 --- a/sapi/pi3web/config.m4 +++ b/sapi/pi3web/config.m4 @@ -6,7 +6,7 @@ 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 diff --git a/sapi/servlet/config.m4 b/sapi/servlet/config.m4 index 26cd63c92f..05ebd70fad 100644 --- a/sapi/servlet/config.m4 +++ b/sapi/servlet/config.m4 @@ -4,7 +4,7 @@ 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.], [ -- 2.40.0