Skip to content

Commit c6d977d

Browse files
committed
Fix long-standing visual pain point: the misalignment of './configure help' text.
Whitespace changes and a couple of grammar fixes.
1 parent 930183f commit c6d977d

File tree

60 files changed

+126
-125
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+126
-125
lines changed

build/libtool.m4

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -193,11 +193,11 @@ AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
193193
enable_win32_dll=yes, enable_win32_dll=no)
194194
195195
AC_ARG_ENABLE([libtool-lock],
196-
[ --disable-libtool-lock avoid locking (might break parallel builds)])
196+
[ --disable-libtool-lock Avoid locking (might break parallel builds)])
197197
test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
198198
199199
AC_ARG_WITH([pic],
200-
[ --with-pic try to use only PIC/non-PIC objects [default=use both]],
200+
[ --with-pic Try to use only PIC/non-PIC objects [default=use both]],
201201
[pic_mode="$withval"],
202202
[pic_mode=default])
203203
test -z "$pic_mode" && pic_mode=default
@@ -1919,7 +1919,7 @@ fi
19191919
AC_DEFUN([_LT_AC_TAGCONFIG],
19201920
[AC_REQUIRE([LT_AC_PROG_SED])dnl
19211921
AC_ARG_WITH([tags],
1922-
[ --with-tags[=TAGS] include additional configurations [automatic]
1922+
[ --with-tags[=TAGS] Include additional configurations [automatic]
19231923
],
19241924
[tagnames="$withval"])
19251925
@@ -2023,7 +2023,7 @@ AC_DEFUN([AC_ENABLE_SHARED],
20232023
[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
20242024
AC_ARG_ENABLE([shared],
20252025
changequote(<<, >>)dnl
2026-
<< --enable-shared[=PKGS] build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
2026+
<< --enable-shared[=PKGS] Build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
20272027
changequote([, ])dnl
20282028
[p=${PACKAGE-default}
20292029
case $enableval in
@@ -2063,7 +2063,7 @@ AC_DEFUN([AC_ENABLE_STATIC],
20632063
[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
20642064
AC_ARG_ENABLE([static],
20652065
changequote(<<, >>)dnl
2066-
<< --enable-static[=PKGS] build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
2066+
<< --enable-static[=PKGS] Build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
20672067
changequote([, ])dnl
20682068
[p=${PACKAGE-default}
20692069
case $enableval in
@@ -2103,7 +2103,7 @@ AC_DEFUN([AC_ENABLE_FAST_INSTALL],
21032103
[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
21042104
AC_ARG_ENABLE([fast-install],
21052105
changequote(<<, >>)dnl
2106-
<< --enable-fast-install[=PKGS] optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
2106+
<< --enable-fast-install[=PKGS] Optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
21072107
changequote([, ])dnl
21082108
[p=${PACKAGE-default}
21092109
case $enableval in
@@ -2241,7 +2241,7 @@ fi
22412241
# find the pathname to the GNU or non-GNU linker
22422242
AC_DEFUN([AC_PROG_LD],
22432243
[AC_ARG_WITH([gnu-ld],
2244-
[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
2244+
[ --with-gnu-ld Assume the C compiler uses GNU ld [default=no]],
22452245
[test "$withval" = no || with_gnu_ld=yes],
22462246
[with_gnu_ld=no])
22472247
AC_REQUIRE([LT_AC_PROG_SED])dnl

configure.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1006,7 +1006,7 @@ dnl Check if all enabled by default extensions should be disabled
10061006
dnl
10071007

10081008
AC_ARG_ENABLE(all,
1009-
[ --disable-all Disable all extensions which are enabled by default
1009+
[ --disable-all Disable all extensions which are enabled by default
10101010
], [
10111011
PHP_ENABLE_ALL=$enableval
10121012
])

ext/bz2/config.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ dnl $Id$
33
dnl
44

55
PHP_ARG_WITH(bz2, for BZip2 support,
6-
[ --with-bz2[=DIR] Include BZip2 support])
6+
[ --with-bz2[=DIR] Include BZip2 support])
77

88
if test "$PHP_BZ2" != "no"; then
99
if test -r $PHP_BZ2/include/bzlib.h; then

ext/curl/config.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ dnl $Id$
33
dnl
44

55
PHP_ARG_WITH(curl, for cURL support,
6-
[ --with-curl[=DIR] Include cURL support])
6+
[ --with-curl[=DIR] Include cURL support])
77

88
if test "$PHP_CURL" != "no"; then
99
if test -r $PHP_CURL/include/curl/easy.h; then

ext/dba/config.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -557,10 +557,10 @@ PHP_ARG_WITH(cdb,,
557557
[ --without-cdb[=DIR] DBA: CDB support (bundled)], $php_dba_enable, no)
558558

559559
PHP_ARG_ENABLE(inifile,,
560-
[ --disable-inifile DBA: INI support (bundled)], $php_dba_enable, no)
560+
[ --disable-inifile DBA: INI support (bundled)], $php_dba_enable, no)
561561

562562
PHP_ARG_ENABLE(flatfile,,
563-
[ --disable-flatfile DBA: FlatFile support (bundled)], $php_dba_enable, no)
563+
[ --disable-flatfile DBA: FlatFile support (bundled)], $php_dba_enable, no)
564564

565565
# CDB
566566
if test "$PHP_CDB" = "yes"; then

ext/enchant/config.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ dnl $Id$
33
dnl
44

55
PHP_ARG_WITH(enchant,for ENCHANT support,
6-
[ --with-enchant[=DIR] Include enchant support.
6+
[ --with-enchant[=DIR] Include enchant support.
77
GNU Aspell version 1.1.3 or higher required.])
88

99
if test "$PHP_ENCHANT" != "no"; then

ext/ereg/config0.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ dnl
55
dnl Check for regex library type
66
dnl
77
PHP_ARG_WITH(regex,,
8-
[ --with-regex=TYPE regex library type: system, php. [TYPE=php]
8+
[ --with-regex=TYPE Regex library type: system, php. [TYPE=php]
99
WARNING: Do NOT use unless you know what you are doing!], php, no)
1010

1111
case $PHP_REGEX in

ext/filter/config.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ PHP_ARG_ENABLE(filter, whether to enable input filter support,
55
[ --disable-filter Disable input filter support], yes)
66

77
PHP_ARG_WITH(pcre-dir, pcre install prefix,
8-
[ --with-pcre-dir FILTER: pcre install prefix], no, no)
8+
[ --with-pcre-dir FILTER: pcre install prefix], no, no)
99

1010
if test "$PHP_FILTER" != "no"; then
1111

ext/gd/config.m4

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ dnl Configure options
77
dnl
88

99
PHP_ARG_WITH(gd, for GD support,
10-
[ --with-gd[=DIR] Include GD support. DIR is the GD library base
10+
[ --with-gd[=DIR] Include GD support. DIR is the GD library base
1111
install directory [BUNDLED]])
1212
if test -z "$PHP_VPX_DIR"; then
1313
PHP_ARG_WITH(vpx-dir, for the location of libvpx,
14-
[ --with-vpx-dir[=DIR] GD: Set the path to libvpx install prefix], no, no)
14+
[ --with-vpx-dir[=DIR] GD: Set the path to libvpx install prefix], no, no)
1515
fi
1616

1717
if test -z "$PHP_JPEG_DIR"; then
@@ -39,10 +39,10 @@ PHP_ARG_WITH(t1lib, for T1lib support,
3939
[ --with-t1lib[=DIR] GD: Include T1lib support. T1lib version >= 5.0.0 required], no, no)
4040

4141
PHP_ARG_ENABLE(gd-native-ttf, whether to enable truetype string function in GD,
42-
[ --enable-gd-native-ttf GD: Enable TrueType string function], no, no)
42+
[ --enable-gd-native-ttf GD: Enable TrueType string function], no, no)
4343

4444
PHP_ARG_ENABLE(gd-jis-conv, whether to enable JIS-mapped Japanese font support in GD,
45-
[ --enable-gd-jis-conv GD: Enable JIS-mapped Japanese font support], no, no)
45+
[ --enable-gd-jis-conv GD: Enable JIS-mapped Japanese font support], no, no)
4646

4747
dnl
4848
dnl Checks for the configure options

ext/gettext/config.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ dnl $Id$
33
dnl
44

55
PHP_ARG_WITH(gettext,for GNU gettext support,
6-
[ --with-gettext[=DIR] Include GNU gettext support])
6+
[ --with-gettext[=DIR] Include GNU gettext support])
77

88
if test "$PHP_GETTEXT" != "no"; then
99
for i in $PHP_GETTEXT /usr/local /usr; do

0 commit comments

Comments
 (0)