]> granicus.if.org Git - php/commitdiff
Aligned configure help texts.
authorfoobar <sniper@php.net>
Fri, 3 Oct 2003 05:24:33 +0000 (05:24 +0000)
committerfoobar <sniper@php.net>
Fri, 3 Oct 2003 05:24:33 +0000 (05:24 +0000)
18 files changed:
TSRM/tsrm.m4
Zend/Zend.m4
configure.in
ext/dba/config.m4
ext/filepro/config.m4
ext/imap/config.m4
ext/mime_magic/config.m4
ext/mnogosearch/config.m4
ext/oci8/config.m4
ext/odbc/config.m4
ext/oracle/config.m4
sapi/apache2filter/config.m4
sapi/caudium/config.m4
sapi/cgi/config9.m4
sapi/isapi/config.m4
sapi/milter/config.m4
sapi/pi3web/config.m4
sapi/servlet/config.m4

index f9f9e4dcd2335b41c9f401de46d32fe7690a03cc..291b7f2e4ef433c3828367606caea7b8c214835e 100644 (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
index 2fe66ee78530c458941e7ca6d953dcc0a89fbcfa..4445dd0e0e9a05b8cc7da88bdd09b36b5db8836e 100644 (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
index 7366aafdca0da39397adc521d0c0b5844b4ddef8..7ba2d2c18ed0a44be2110a4a70f1bc59a98a2603 100644 (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"
index dabc72d48b1b6c958b81420ce6f2ae4feede27c2..8fd659f0627f6bb3fbd49243a4901776ac64f502 100644 (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
index 13f02c2125c7b2e3221b7cb39f908ad94c3289ed..6222bfba2fb002508f419d6e65b4e62c878d3d2f 100644 (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.])
 
index 5531d506b1d337f56ad7e42f5ddea149600b88dc..ceefb0d04af573e45ee28ae4a51ca5414063ea63 100644 (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
index b47b1ba97b965962ac8378e60f8c0aa702f038ae..1682399501ac44f04236a6c58aabbedb8e368572 100644 (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
 
index d029412440ff33da4cb4c16005d1ae851d853531..d127ce670230a0db8ba0bdc9a58761f54cccd907 100644 (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
   
index 09b9d70078dd90fe1816612b3d52fa5335dbb8f2..69fe4466b2758e8cbd3b4c8dd16b197db902fa4d 100644 (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])
index de94db3f37ec327bc6f76fc0a32ce9b45566fb80..ecc28e731dba5fcee9a529238d0f283a5bd2df7c 100644 (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],
index d3283e18d3926c59bedc7a1eaa7ec5e520dd727e..fdd5276ccde123ca596dfa2b2d8a278ab2ae6195 100644 (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])
index 7cbe7ede7243eb44a9beada24b7ec64f9aa3043f..4ce866b17d6daf0f298d74dbe3716b144aae4ac8 100644 (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
index a4f76db1b6441e9f1095e8fdeeb2351e6a8b0a85..6d5e4bbc19266fce680a8d74c83bd8be07651f24 100644 (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.],
 [
index c66603875334f39df9647f233dc873d19acaf62b..a16b6ab8a49135986714b023045c8b210a66641a 100644 (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
index ece730cef9f4f7982d6888a3b12c96862ad3119c..8e0c4bc11fdd45e74c81d276cffa422fe8494b01 100644 (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
index 4194d4f2cf143d78784b02be4652f671d19dd856..37269d0b58fac5948787b37683820efb8702c273 100644 (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
index 5b1ec78140185701a881cc37be5eb6316ebb3bb3..325aac24477f569d9a128e07a1e9c0601abffdfd 100644 (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
index 26cd63c92faccb6e91adcbe7915bd27eaf1126ab..05ebd70fad9deb19943bfd6d18386978dda6af7e 100644 (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.],
 [