Aligned configure help texts.

This commit is contained in:
foobar 2003-10-03 05:24:33 +00:00
parent 09b8fdc2bb
commit db50cd251e
18 changed files with 34 additions and 31 deletions

View file

@ -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

View file

@ -98,7 +98,7 @@ ZEND_FP_EXCEPT
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_ARG_ENABLE(debug,
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(memory-limit,
])
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

View file

@ -868,7 +868,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
@ -892,6 +894,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
@ -1111,6 +1114,7 @@ dnl
dnl Libtool creation
dnl
PHP_HELP_SEPARATOR([Libtool:])
PHP_CONFIGURE_PART(Configuring libtool)
LDFLAGS="$LDFLAGS $PHP_AIX_LDFLAGS"

View file

@ -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

View file

@ -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.])

View file

@ -103,7 +103,7 @@ AC_DEFUN(PHP_IMAP_KRB_CHK, [
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

View file

@ -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

View file

@ -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

View file

@ -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])

View file

@ -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],

View file

@ -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])

View file

@ -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

View file

@ -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.],
[

View file

@ -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

View file

@ -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

View file

@ -4,7 +4,7 @@ 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

View file

@ -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

View file

@ -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.],
[