archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Aligned configure help texts.

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

5
TSRM/tsrm.m4
View file

@ -95,14 +95,15 @@ dnl For the thread implementations, we always use --with-*
dnl to maintain consistency dnl to maintain consistency
AC_ARG_WITH(tsrm-pth, 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=$withval
],[ ],[
TSRM_PTH=no TSRM_PTH=no
]) ])
AC_ARG_WITH(tsrm-st, AC_ARG_WITH(tsrm-st,
[ --with-tsrm-st],[ [ --with-tsrm-st Use SGI's State Threads],[
TSRM_ST=$withval TSRM_ST=$withval
],[ ],[
TSRM_ST=no TSRM_ST=no

10
Zend/Zend.m4
View file

@ -98,7 +98,7 @@ ZEND_FP_EXCEPT
AC_DEFUN(LIBZEND_ENABLE_DEBUG,[ AC_DEFUN(LIBZEND_ENABLE_DEBUG,[
AC_ARG_ENABLE(debug, AC_ARG_ENABLE(debug,
[ --enable-debug Compile with debugging symbols],[ [ --enable-debug Compile with debugging symbols],[
ZEND_DEBUG=$enableval ZEND_DEBUG=$enableval
],[ ],[
ZEND_DEBUG=no ZEND_DEBUG=no
@ -109,15 +109,15 @@ AC_ARG_ENABLE(debug,
AC_DEFUN(LIBZEND_OTHER_CHECKS,[ AC_DEFUN(LIBZEND_OTHER_CHECKS,[
AC_ARG_ENABLE(maintainer-zts, 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=$enableval
],[ ],[
ZEND_MAINTAINER_ZTS=no ZEND_MAINTAINER_ZTS=no
]) ])
AC_ARG_ENABLE(inline-optimization, AC_ARG_ENABLE(inline-optimization,
[ --disable-inline-optimization If building zend_execute.lo fails, try [ --disable-inline-optimization
this switch.],[ If building zend_execute.lo fails, try this switch.],[
ZEND_INLINE_OPTIMIZATION=$enableval ZEND_INLINE_OPTIMIZATION=$enableval
],[ ],[
ZEND_INLINE_OPTIMIZATION=yes ZEND_INLINE_OPTIMIZATION=yes
@ -131,7 +131,7 @@ AC_ARG_ENABLE(memory-limit,
]) ])
AC_ARG_ENABLE(zend-multibyte, 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=$enableval
],[ ],[
ZEND_MULTIBYTE=no ZEND_MULTIBYTE=no

4
configure.in
View file

@ -868,7 +868,9 @@ fi
dnl Configuring Zend and TSRM. dnl Configuring Zend and TSRM.
dnl ------------------------------------------------------------------------- dnl -------------------------------------------------------------------------
PHP_HELP_SEPARATOR([Zend:])
PHP_CONFIGURE_PART(Configuring Zend) PHP_CONFIGURE_PART(Configuring Zend)
LIBZEND_BASIC_CHECKS LIBZEND_BASIC_CHECKS
LIBZEND_DLSYM_CHECK LIBZEND_DLSYM_CHECK
LIBZEND_OTHER_CHECKS LIBZEND_OTHER_CHECKS
@ -892,6 +894,7 @@ fi
ZEND_EXTRA_LIBS="$LIBS" ZEND_EXTRA_LIBS="$LIBS"
unset LIBS LDFLAGS unset LIBS LDFLAGS
PHP_HELP_SEPARATOR([TSRM:])
PHP_CONFIGURE_PART(Configuring TSRM) PHP_CONFIGURE_PART(Configuring TSRM)
TSRM_BASIC_CHECKS TSRM_BASIC_CHECKS
if test "$PHP_THREAD_SAFETY" = "yes"; then if test "$PHP_THREAD_SAFETY" = "yes"; then
@ -1111,6 +1114,7 @@ dnl
dnl Libtool creation dnl Libtool creation
dnl dnl
PHP_HELP_SEPARATOR([Libtool:])
PHP_CONFIGURE_PART(Configuring libtool) PHP_CONFIGURE_PART(Configuring libtool)
LDFLAGS="$LDFLAGS $PHP_AIX_LDFLAGS" LDFLAGS="$LDFLAGS $PHP_AIX_LDFLAGS"

4
ext/dba/config.m4
View file

@ -393,7 +393,7 @@ AC_DEFUN(PHP_DBA_BUILTIN_INI,[
]) ])
AC_ARG_WITH(inifile, AC_ARG_WITH(inifile,
[ --with-inifile DBA: Include INI support],[ [ --with-inifile DBA: Include INI support],[
if test "$withval" != "no"; then if test "$withval" != "no"; then
PHP_DBA_BUILTIN_INI PHP_DBA_BUILTIN_INI
fi fi
@ -414,7 +414,7 @@ dnl
dnl FlatFile check must be the last one. dnl FlatFile check must be the last one.
dnl dnl
AC_ARG_WITH(flatfile, AC_ARG_WITH(flatfile,
[ --with-flatfile DBA: Include FlatFile support],[ [ --with-flatfile DBA: Include FlatFile support],[
if test "$withval" != "no"; then if test "$withval" != "no"; then
PHP_DBA_BUILTIN_FLATFILE PHP_DBA_BUILTIN_FLATFILE
fi fi

2
ext/filepro/config.m4
View file

@ -2,8 +2,6 @@ dnl
dnl $Id$ dnl $Id$
dnl dnl
AC_ARG_WITH(filepro,[],[enable_filepro=$withval])
PHP_ARG_ENABLE(filepro,whether to enable the bundled filePro support, PHP_ARG_ENABLE(filepro,whether to enable the bundled filePro support,
[ --enable-filepro Enable the bundled read-only filePro support.]) [ --enable-filepro Enable the bundled read-only filePro support.])

2
ext/imap/config.m4
View file

@ -103,7 +103,7 @@ AC_DEFUN(PHP_IMAP_KRB_CHK, [
AC_DEFUN(PHP_IMAP_SSL_CHK, [ AC_DEFUN(PHP_IMAP_SSL_CHK, [
AC_ARG_WITH(imap-ssl, 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=$withval
],[ ],[
PHP_IMAP_SSL=no PHP_IMAP_SSL=no

5
ext/mime_magic/config.m4
View file

@ -3,8 +3,9 @@ dnl $Id$
dnl dnl
PHP_ARG_WITH(mime-magic, whether to include mime_magic support, PHP_ARG_WITH(mime-magic, whether to include mime_magic support,
[ --with-mime-magic[=FILE] Include mime_magic support. FILE is the optional [ --with-mime-magic[=FILE]
pathname to the magic.mime file.]) Include mime_magic support. FILE is the optional
pathname to the magic.mime file.])
if test "$PHP_MIME_MAGIC" != "no"; then if test "$PHP_MIME_MAGIC" != "no"; then

3
ext/mnogosearch/config.m4
View file

@ -6,8 +6,7 @@ dnl
PHP_ARG_WITH(mnogosearch,for mnoGoSearch support, PHP_ARG_WITH(mnogosearch,for mnoGoSearch support,
[ --with-mnogosearch[=DIR] [ --with-mnogosearch[=DIR]
Include mnoGoSearch support. DIR is the mnoGoSearch Include mnoGoSearch support. DIR is the mnoGoSearch
base install directory, defaults to base install directory, defaults to /usr/local/mnogosearch.])
/usr/local/mnogosearch.])
if test "$PHP_MNOGOSEARCH" != "no"; then if test "$PHP_MNOGOSEARCH" != "no"; then

3
ext/oci8/config.m4
View file

@ -42,8 +42,7 @@ AC_DEFUN(AC_OCI8_VERSION,[
]) ])
PHP_ARG_WITH(oci8, for Oracle-OCI8 support, PHP_ARG_WITH(oci8, for Oracle-OCI8 support,
[ --with-oci8[=DIR] Include Oracle-oci8 support. Default DIR is [ --with-oci8[=DIR] Include Oracle-oci8 support. Default DIR is ORACLE_HOME.])
ORACLE_HOME.])
if test "$PHP_OCI8" != "no"; then if test "$PHP_OCI8" != "no"; then
AC_MSG_CHECKING([Oracle Install-Dir]) AC_MSG_CHECKING([Oracle Install-Dir])

2
ext/odbc/config.m4
View file

@ -212,7 +212,7 @@ fi
if test -z "$ODBC_TYPE"; then if test -z "$ODBC_TYPE"; then
AC_MSG_CHECKING(for Empress support) AC_MSG_CHECKING(for Empress support)
AC_ARG_WITH(empress, 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. install directory, defaults to \$EMPRESSPATH.
From PHP4, this option only supports Empress Version From PHP4, this option only supports Empress Version
8.60 and above], 8.60 and above],

3
ext/oracle/config.m4
View file

@ -26,8 +26,7 @@ AC_DEFUN(AC_ORACLE_VERSION,[
]) ])
PHP_ARG_WITH(oracle, for Oracle-ORACLE support, PHP_ARG_WITH(oracle, for Oracle-ORACLE support,
[ --with-oracle[=DIR] Include Oracle-oci7 support. Default DIR is [ --with-oracle[=DIR] Include Oracle-oci7 support. Default DIR is ORACLE_HOME.])
ORACLE_HOME.])
if test "$PHP_ORACLE" != "no"; then if test "$PHP_ORACLE" != "no"; then
AC_MSG_CHECKING([Oracle Install-Dir]) AC_MSG_CHECKING([Oracle Install-Dir])

3
sapi/apache2filter/config.m4
View file

@ -4,7 +4,8 @@ dnl
AC_MSG_CHECKING(for Apache 2.0 filter-module support via DSO through APXS) AC_MSG_CHECKING(for Apache 2.0 filter-module support via DSO through APXS)
AC_ARG_WITH(apxs2filter, 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".],[ pathname to the Apache apxs tool; defaults to "apxs".],[
if test "$withval" = "yes"; then if test "$withval" = "yes"; then
APXS=apxs APXS=apxs

2
sapi/caudium/config.m4
View file

@ -5,7 +5,7 @@ dnl
RESULT=no RESULT=no
AC_MSG_CHECKING(for Caudium support) AC_MSG_CHECKING(for Caudium support)
AC_ARG_WITH(caudium, 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 DIR is the Caudium server dir, with the default value
/usr/local/caudium/server.], /usr/local/caudium/server.],
[ [

9
sapi/cgi/config9.m4
View file

@ -12,9 +12,9 @@ AC_ARG_ENABLE(cgi,
AC_ARG_ENABLE(force-cgi-redirect, AC_ARG_ENABLE(force-cgi-redirect,
[ --enable-force-cgi-redirect [ --enable-force-cgi-redirect
Enable the security check for internal server Enable the security check for internal server
redirects. You should use this if you are redirects. You should use this if you are
running the CGI version with Apache.], running the CGI version with Apache.],
[ [
PHP_FORCE_CGI_REDIRECT=$enableval PHP_FORCE_CGI_REDIRECT=$enableval
],[ ],[
@ -42,7 +42,8 @@ AC_ARG_ENABLE(fastcgi,
]) ])
AC_ARG_ENABLE(path-info-check, 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.], /info.php/test?a=b will fail to work.],
[ [
PHP_ENABLE_PATHINFO_CHECK=$enableval PHP_ENABLE_PATHINFO_CHECK=$enableval

2
sapi/isapi/config.m4
View file

@ -5,7 +5,7 @@ dnl
RESULT=no RESULT=no
AC_MSG_CHECKING(for Zeus ISAPI support) AC_MSG_CHECKING(for Zeus ISAPI support)
AC_ARG_WITH(isapi, 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 if test "$withval" = "yes"; then
ZEUSPATH=/usr/local/zeus # the default ZEUSPATH=/usr/local/zeus # the default

2
sapi/milter/config.m4
View file

@ -4,7 +4,7 @@ dnl
AC_MSG_CHECKING(for Milter support) AC_MSG_CHECKING(for Milter support)
AC_ARG_WITH(milter, 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 "$withval" = "yes"; then
if test -f /usr/lib/libmilter.a ; then if test -f /usr/lib/libmilter.a ; then
MILTERPATH=/usr/lib MILTERPATH=/usr/lib

2
sapi/pi3web/config.m4
View file

@ -6,7 +6,7 @@ RESULT=no
AC_MSG_CHECKING(for Pi3Web support) AC_MSG_CHECKING(for Pi3Web support)
AC_ARG_WITH(pi3web, 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" != "no"; then
if test "$withval" = "yes"; then if test "$withval" = "yes"; then

2
sapi/servlet/config.m4
View file

@ -4,7 +4,7 @@ dnl
AC_MSG_CHECKING(for Servlet support) AC_MSG_CHECKING(for Servlet support)
AC_ARG_WITH(servlet, 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 directory for the JSDK. This SAPI prereqs the
java extension must be built as a shared dl.], java extension must be built as a shared dl.],
[ [