Merge branch 'PHP-7.4'

* PHP-7.4:
  Add AS_HELP_STRING to *nix build configure options

71 files changed, 691 insertions, 349 deletions

diff --git a/ext/bcmath/config.m4 b/ext/bcmath/config.m4
index 1dd2de2dbf..e6a99a7239 100644
--- a/ext/bcmath/config.m4
+++ b/ext/bcmath/config.m4
@@ -1,7 +1,9 @@
 dnl config.m4 for extension bcmath
 
-PHP_ARG_ENABLE(bcmath, whether to enable bc style precision math functions,
-[  --enable-bcmath         Enable bc style precision math functions])
+PHP_ARG_ENABLE([bcmath],
+  [whether to enable bc style precision math functions],
+  [AS_HELP_STRING([--enable-bcmath],
+    [Enable bc style precision math functions])])
 
 if test "$PHP_BCMATH" != "no"; then
   PHP_NEW_EXTENSION(bcmath, bcmath.c \
diff --git a/ext/bz2/config.m4 b/ext/bz2/config.m4
index 9ba4a24c2b..65e8fcce23 100644
--- a/ext/bz2/config.m4
+++ b/ext/bz2/config.m4
@@ -1,7 +1,9 @@
 dnl config.m4 for extension bz2
 
-PHP_ARG_WITH(bz2, for BZip2 support,
-[  --with-bz2[=DIR]          Include BZip2 support])
+PHP_ARG_WITH([bz2],
+  [for BZip2 support],
+  [AS_HELP_STRING([[--with-bz2[=DIR]]],
+    [Include BZip2 support])])
 
 if test "$PHP_BZ2" != "no"; then
   if test -r $PHP_BZ2/include/bzlib.h; then
diff --git a/ext/calendar/config.m4 b/ext/calendar/config.m4
index b57737a144..7c179760df 100644
--- a/ext/calendar/config.m4
+++ b/ext/calendar/config.m4
@@ -1,7 +1,9 @@
 dnl config.m4 for extension calendar
 
-PHP_ARG_ENABLE(calendar,whether to enable calendar conversion support,
-[  --enable-calendar       Enable support for calendar conversion])
+PHP_ARG_ENABLE([calendar],
+  [whether to enable calendar conversion support],
+  [AS_HELP_STRING([--enable-calendar],
+    [Enable support for calendar conversion])])
 
 if test "$PHP_CALENDAR" = "yes"; then
   AC_DEFINE(HAVE_CALENDAR,1,[ ])
diff --git a/ext/ctype/config.m4 b/ext/ctype/config.m4
index d1362cfa08..726648bfc0 100644
--- a/ext/ctype/config.m4
+++ b/ext/ctype/config.m4
@@ -1,7 +1,10 @@
 dnl config.m4 for extension ctype
 
-PHP_ARG_ENABLE(ctype, whether to enable ctype functions,
-[  --disable-ctype         Disable ctype functions], yes)
+PHP_ARG_ENABLE([ctype],
+  [whether to enable ctype functions],
+  [AS_HELP_STRING([--disable-ctype],
+    [Disable ctype functions])],
+  [yes])
 
 if test "$PHP_CTYPE" != "no"; then
   AC_DEFINE(HAVE_CTYPE, 1, [ ])
diff --git a/ext/curl/config.m4 b/ext/curl/config.m4
index 876e931e04..6ebfac78c8 100644
--- a/ext/curl/config.m4
+++ b/ext/curl/config.m4
@@ -1,7 +1,9 @@
 dnl config.m4 for extension curl
 
-PHP_ARG_WITH(curl, for cURL support,
-[  --with-curl               Include cURL support])
+PHP_ARG_WITH([curl],
+  [for cURL support],
+  [AS_HELP_STRING([--with-curl],
+    [Include cURL support])])
 
 if test "$PHP_CURL" != "no"; then
   PKG_CHECK_MODULES([CURL], [libcurl >= 7.15.5])
diff --git a/ext/dba/config.m4 b/ext/dba/config.m4
index 86fa48072e..19a916b0df 100644
--- a/ext/dba/config.m4
+++ b/ext/dba/config.m4
@@ -67,40 +67,70 @@ dnl
 dnl Options
 dnl
 
-PHP_ARG_ENABLE(dba,,
-[  --enable-dba            Build DBA with bundled modules. To build shared DBA
-                          extension use --enable-dba=shared])
-
-PHP_ARG_WITH(qdbm,,
-[  --with-qdbm[=DIR]         DBA: QDBM support], no, no)
-
-PHP_ARG_WITH(gdbm,,
-[  --with-gdbm[=DIR]         DBA: GDBM support], no, no)
-
-PHP_ARG_WITH(ndbm,,
-[  --with-ndbm[=DIR]         DBA: NDBM support], no, no)
-
-PHP_ARG_WITH(db4,,
-[  --with-db4[=DIR]          DBA: Oracle Berkeley DB 4.x or 5.x support], no, no)
-
-PHP_ARG_WITH(db3,,
-[  --with-db3[=DIR]          DBA: Oracle Berkeley DB 3.x support], no, no)
-
-PHP_ARG_WITH(db2,,
-[  --with-db2[=DIR]          DBA: Oracle Berkeley DB 2.x support], no, no)
-
-PHP_ARG_WITH(db1,,
-[  --with-db1[=DIR]          DBA: Oracle Berkeley DB 1.x support/emulation], no, no)
-
-PHP_ARG_WITH(dbm,,
-[  --with-dbm[=DIR]          DBA: DBM support], no, no)
-
-PHP_ARG_WITH(tcadb,,
-[  --with-tcadb[=DIR]        DBA: Tokyo Cabinet abstract DB support], no, no)
-
-PHP_ARG_WITH(lmdb,,
-[  --with-lmdb[=DIR]         DBA: Lightning memory-mapped database support], no, no)
-
+PHP_ARG_ENABLE([dba],,
+  [AS_HELP_STRING([--enable-dba],
+    [Build DBA with bundled modules. To build shared DBA extension use
+    --enable-dba=shared])])
+
+PHP_ARG_WITH([qdbm],,
+  [AS_HELP_STRING([[--with-qdbm[=DIR]]],
+    [DBA: QDBM support])],
+  [no],
+  [no])
+
+PHP_ARG_WITH([gdbm],,
+  [AS_HELP_STRING([[--with-gdbm[=DIR]]],
+    [DBA: GDBM support])],
+  [no],
+  [no])
+
+PHP_ARG_WITH([ndbm],,
+  [AS_HELP_STRING([[--with-ndbm[=DIR]]],
+    [DBA: NDBM support])],
+  [no],
+  [no])
+
+PHP_ARG_WITH([db4],,
+  [AS_HELP_STRING([[--with-db4[=DIR]]],
+    [DBA: Oracle Berkeley DB 4.x or 5.x support])],
+  [no],
+  [no])
+
+PHP_ARG_WITH([db3],,
+  [AS_HELP_STRING([[--with-db3[=DIR]]],
+    [DBA: Oracle Berkeley DB 3.x support])],
+  [no],
+  [no])
+
+PHP_ARG_WITH([db2],,
+  [AS_HELP_STRING([[--with-db2[=DIR]]],
+    [DBA: Oracle Berkeley DB 2.x support])],
+  [no],
+  [no])
+
+PHP_ARG_WITH([db1],,
+  [AS_HELP_STRING([[--with-db1[=DIR]]],
+    [DBA: Oracle Berkeley DB 1.x support/emulation])],
+  [no],
+  [no])
+
+PHP_ARG_WITH([dbm],,
+  [AS_HELP_STRING([[--with-dbm[=DIR]]],
+    [DBA: DBM support])],
+  [no],
+  [no])
+
+PHP_ARG_WITH([tcadb],,
+  [AS_HELP_STRING([[--with-tcadb[=DIR]]],
+    [DBA: Tokyo Cabinet abstract DB support])],
+  [no],
+  [no])
+
+PHP_ARG_WITH([lmdb],,
+  [AS_HELP_STRING([[--with-lmdb[=DIR]]],
+    [DBA: Lightning memory-mapped database support])],
+  [no],
+  [no])
 
 dnl
 dnl Library checks
@@ -589,14 +619,23 @@ else
   php_dba_enable=no
 fi
 
-PHP_ARG_WITH(cdb,,
-[  --without-cdb[=DIR]       DBA: CDB support (bundled)], $php_dba_enable, no)
-
-PHP_ARG_ENABLE(inifile,,
-[  --disable-inifile       DBA: INI support (bundled)], $php_dba_enable, no)
-
-PHP_ARG_ENABLE(flatfile,,
-[  --disable-flatfile      DBA: FlatFile support (bundled)], $php_dba_enable, no)
+PHP_ARG_WITH([cdb],,
+  [AS_HELP_STRING([[--without-cdb[=DIR]]],
+    [DBA: CDB support (bundled)])],
+  [$php_dba_enable],
+  [no])
+
+PHP_ARG_ENABLE([inifile],,
+  [AS_HELP_STRING([--disable-inifile],
+    [DBA: INI support (bundled)])],
+  [$php_dba_enable],
+  [no])
+
+PHP_ARG_ENABLE([flatfile],,
+  [AS_HELP_STRING([--disable-flatfile],
+    [DBA: FlatFile support (bundled)])],
+  [$php_dba_enable],
+  [no])
 
 # CDB
 if test "$PHP_CDB" = "yes"; then
diff --git a/ext/dom/config.m4 b/ext/dom/config.m4
index 5d96e7bc0f..dc4fccbc45 100644
--- a/ext/dom/config.m4
+++ b/ext/dom/config.m4
@@ -1,11 +1,18 @@
 dnl config.m4 for extension dom
 
-PHP_ARG_ENABLE(dom, whether to enable DOM support,
-[  --disable-dom           Disable DOM support], yes)
+PHP_ARG_ENABLE([dom],
+  [whether to enable DOM support],
+  [AS_HELP_STRING([--disable-dom],
+    [Disable DOM support])],
+  [yes])
 
 if test -z "$PHP_LIBXML_DIR"; then
-  PHP_ARG_WITH(libxml-dir, libxml2 install dir,
-  [  --with-libxml-dir[=DIR]   DOM: libxml2 install prefix], no, no)
+  PHP_ARG_WITH([libxml-dir],
+    [libxml2 install dir],
+    [AS_HELP_STRING([[--with-libxml-dir[=DIR]]],
+      [DOM: libxml2 install prefix])],
+    [no],
+    [no])
 fi
 
 if test "$PHP_DOM" != "no"; then
diff --git a/ext/enchant/config.m4 b/ext/enchant/config.m4
index 81b77c9b95..d635281acb 100644
--- a/ext/enchant/config.m4
+++ b/ext/enchant/config.m4
@@ -1,8 +1,9 @@
 dnl config.m4 for extension enchant
 
-PHP_ARG_WITH(enchant,for ENCHANT support,
-[  --with-enchant[=DIR]      Include enchant support.
-                          GNU Aspell version 1.1.3 or higher required.])
+PHP_ARG_WITH([enchant],
+  [for ENCHANT support],
+  [AS_HELP_STRING([[--with-enchant[=DIR]]],
+    [Include enchant support. GNU Aspell version 1.1.3 or higher required.])])
 
 if test "$PHP_ENCHANT" != "no"; then
 	PHP_NEW_EXTENSION(enchant, enchant.c, $ext_shared)
diff --git a/ext/exif/config.m4 b/ext/exif/config.m4
index 800b84e48d..4943a69713 100644
--- a/ext/exif/config.m4
+++ b/ext/exif/config.m4
@@ -1,7 +1,9 @@
 dnl config.m4 for extension exif
 
-PHP_ARG_ENABLE(exif, whether to enable EXIF (metadata from images) support,
-[  --enable-exif           Enable EXIF (metadata from images) support])
+PHP_ARG_ENABLE([exif],
+  [whether to enable EXIF (metadata from images) support],
+  [AS_HELP_STRING([--enable-exif],
+    [Enable EXIF (metadata from images) support])])
 
 if test "$PHP_EXIF" != "no"; then
   AC_DEFINE(HAVE_EXIF, 1, [Whether you want EXIF (metadata from images) support])
diff --git a/ext/ffi/config.m4 b/ext/ffi/config.m4
index 29c1477300..5132cfe9e1 100644
--- a/ext/ffi/config.m4
+++ b/ext/ffi/config.m4
@@ -1,7 +1,9 @@
 dnl config.m4 for extension FFI
 
-PHP_ARG_WITH(ffi, for FFI support,
-[  --with-ffi             Include FFI support])
+PHP_ARG_WITH([ffi],
+  [for FFI support],
+  [AS_HELP_STRING([--with-ffi],
+    [Include FFI support])])
 
 if test "$PHP_FFI" != "no"; then
   if test -r $PHP_FFI/include/ffi.h; then
@@ -42,7 +44,7 @@ if test "$PHP_FFI" != "no"; then
 
   AC_CHECK_TYPES(long double)
 
-  PHP_CHECK_LIBRARY(ffi, ffi_call, 
+  PHP_CHECK_LIBRARY(ffi, ffi_call,
   [
     PHP_ADD_INCLUDE($FFI_INCDIR)
     PHP_ADD_LIBRARY_WITH_PATH(ffi, $FFI_LIBDIR, FFI_SHARED_LIBADD)
diff --git a/ext/fileinfo/config.m4 b/ext/fileinfo/config.m4
index 9a7b06aebb..d3e8a19587 100644
--- a/ext/fileinfo/config.m4
+++ b/ext/fileinfo/config.m4
@@ -1,7 +1,10 @@
 dnl config.m4 for extension fileinfo
 
-PHP_ARG_ENABLE(fileinfo, for fileinfo support,
-[  --disable-fileinfo      Disable fileinfo support], yes)
+PHP_ARG_ENABLE([fileinfo],
+  [for fileinfo support],
+  [AS_HELP_STRING([--disable-fileinfo],
+    [Disable fileinfo support])],
+  [yes])
 
 if test "$PHP_FILEINFO" != "no"; then
 
diff --git a/ext/filter/config.m4 b/ext/filter/config.m4
index 7201503d31..55f382eb21 100644
--- a/ext/filter/config.m4
+++ b/ext/filter/config.m4
@@ -1,10 +1,17 @@
 dnl config.m4 for input filtering extension
 
-PHP_ARG_ENABLE(filter, whether to enable input filter support,
-[  --disable-filter        Disable input filter support], yes)
+PHP_ARG_ENABLE([filter],
+  [whether to enable input filter support],
+  [AS_HELP_STRING([--disable-filter],
+    [Disable input filter support])],
+  [yes])
 
-PHP_ARG_WITH(pcre-dir, pcre install prefix,
-[  --with-pcre-dir         FILTER: pcre install prefix], no, no)
+PHP_ARG_WITH([pcre-dir],
+  [pcre install prefix],
+  [AS_HELP_STRING([--with-pcre-dir],
+    [FILTER: pcre install prefix])],
+  [no],
+  [no])
 
 if test "$PHP_FILTER" != "no"; then
 
diff --git a/ext/ftp/config.m4 b/ext/ftp/config.m4
index b7f58b651f..a9b9371741 100644
--- a/ext/ftp/config.m4
+++ b/ext/ftp/config.m4
@@ -1,10 +1,16 @@
 dnl config.m4 for extension ftp
 
-PHP_ARG_ENABLE(ftp,whether to enable FTP support,
-[  --enable-ftp            Enable FTP support])
+PHP_ARG_ENABLE([ftp],
+  [whether to enable FTP support],
+  [AS_HELP_STRING([--enable-ftp],
+    [Enable FTP support])])
 
-PHP_ARG_WITH(openssl-dir,OpenSSL dir for FTP,
-[  --with-openssl-dir[=DIR]  FTP: openssl install prefix], no, no)
+PHP_ARG_WITH([openssl-dir],
+  [OpenSSL dir for FTP],
+  [AS_HELP_STRING([[--with-openssl-dir[=DIR]]],
+    [FTP: openssl install prefix])],
+  [no],
+  [no])
 
 if test "$PHP_FTP" = "yes"; then
   AC_DEFINE(HAVE_FTP,1,[Whether you want FTP support])
diff --git a/ext/gd/config.m4 b/ext/gd/config.m4
index 61bd7d313f..c1b96fa812 100644
--- a/ext/gd/config.m4
+++ b/ext/gd/config.m4
@@ -4,30 +4,56 @@ dnl
 dnl Configure options
 dnl
 
-PHP_ARG_ENABLE(gd, for GD support,
-[  --enable-gd             Include GD support])
-
-PHP_ARG_WITH(external-gd, for external libgd,
-[  --with-external-gd      Use external libgd], no, no)
+PHP_ARG_ENABLE([gd],
+  [for GD support],
+  [AS_HELP_STRING([--enable-gd],
+    [Include GD support])])
+
+PHP_ARG_WITH([external-gd],
+  [for external libgd],
+  [AS_HELP_STRING([--with-external-gd],
+    [Use external libgd])],
+  [no],
+  [no])
 
 if test -z "$PHP_WEBP"; then
-  PHP_ARG_WITH(webp, for libwebp,
-  [  --with-webp             GD: Enable WEBP support], no, no)
+  PHP_ARG_WITH([webp],
+    [for libwebp],
+    [AS_HELP_STRING([--with-webp],
+      [GD: Enable WEBP support])],
+    [no],
+    [no])
 fi
 
 if test -z "$PHP_JPEG"; then
-  PHP_ARG_WITH(jpeg, for libjpeg,
-  [  --with-jpeg             GD: Enable JPEG support], no, no)
+  PHP_ARG_WITH([jpeg],
+    [for libjpeg],
+    [AS_HELP_STRING([--with-jpeg],
+      [GD: Enable JPEG support])],
+    [no],
+    [no])
 fi
 
-PHP_ARG_WITH(xpm, for libXpm,
-[  --with-xpm              GD: Enable XPM support], no, no)
-
-PHP_ARG_WITH(freetype, for FreeType 2,
-[  --with-freetype         GD: Enable FreeType 2 support], no, no)
-
-PHP_ARG_ENABLE(gd-jis-conv, whether to enable JIS-mapped Japanese font support in GD,
-[  --enable-gd-jis-conv    GD: Enable JIS-mapped Japanese font support], no, no)
+PHP_ARG_WITH([xpm],
+  [for libXpm],
+  [AS_HELP_STRING([--with-xpm],
+    [GD: Enable XPM support])],
+  [no],
+  [no])
+
+PHP_ARG_WITH([freetype],
+  [for FreeType 2],
+  [AS_HELP_STRING([--with-freetype],
+    [GD: Enable FreeType 2 support])],
+  [no],
+  [no])
+
+PHP_ARG_ENABLE([gd-jis-conv],
+  [whether to enable JIS-mapped Japanese font support in GD],
+  [AS_HELP_STRING([--enable-gd-jis-conv],
+    [GD: Enable JIS-mapped Japanese font support])],
+  [no],
+  [no])
 
 dnl
 dnl Checks for the configure options
diff --git a/ext/gettext/config.m4 b/ext/gettext/config.m4
index 63691e61f9..5f9ee32fa7 100644
--- a/ext/gettext/config.m4
+++ b/ext/gettext/config.m4
@@ -1,7 +1,9 @@
 dnl config.m4 for extension gettext
 
-PHP_ARG_WITH(gettext,for GNU gettext support,
-[  --with-gettext[=DIR]      Include GNU gettext support])
+PHP_ARG_WITH([gettext],
+  [for GNU gettext support],
+  [AS_HELP_STRING([[--with-gettext[=DIR]]],
+    [Include GNU gettext support])])
 
 if test "$PHP_GETTEXT" != "no"; then
   for i in $PHP_GETTEXT /usr/local /usr; do
diff --git a/ext/gmp/config.m4 b/ext/gmp/config.m4
index 75ddf3f37f..622215fe25 100644
--- a/ext/gmp/config.m4
+++ b/ext/gmp/config.m4
@@ -1,5 +1,7 @@
-PHP_ARG_WITH(gmp, for GNU MP support,
-[  --with-gmp[=DIR]          Include GNU MP support])
+PHP_ARG_WITH([gmp],
+  [for GNU MP support],
+  [AS_HELP_STRING([[--with-gmp[=DIR]]],
+    [Include GNU MP support])])
 
 if test "$PHP_GMP" != "no"; then
 
diff --git a/ext/hash/config.m4 b/ext/hash/config.m4
index 21f419ed71..80fe61bb79 100644
--- a/ext/hash/config.m4
+++ b/ext/hash/config.m4
@@ -1,7 +1,9 @@
 dnl config.m4 for extension hash
 
-PHP_ARG_WITH(mhash, for mhash support,
-[  --with-mhash[=DIR]        Include mhash support])
+PHP_ARG_WITH([mhash],
+  [for mhash support],
+  [AS_HELP_STRING([[--with-mhash[=DIR]]],
+    [Include mhash support])])
 
 if test "$PHP_MHASH" != "no"; then
   if test "$PHP_HASH" = "no"; then
diff --git a/ext/iconv/config.m4 b/ext/iconv/config.m4
index 72334f790c..6cc509eb80 100644
--- a/ext/iconv/config.m4
+++ b/ext/iconv/config.m4
@@ -1,7 +1,10 @@
 dnl config.m4 for extension iconv
 
-PHP_ARG_WITH(iconv, for iconv support,
-[  --without-iconv[=DIR]     Exclude iconv support], yes)
+PHP_ARG_WITH([iconv],
+  [for iconv support],
+  [AS_HELP_STRING([[--without-iconv[=DIR]]],
+    [Exclude iconv support])],
+  [yes])
 
 if test "$PHP_ICONV" != "no"; then
 
diff --git a/ext/imap/config.m4 b/ext/imap/config.m4
index 50492182f9..65edbb1401 100644
--- a/ext/imap/config.m4
+++ b/ext/imap/config.m4
@@ -91,16 +91,24 @@ AC_DEFUN([PHP_IMAP_SSL_CHK], [
   fi
 ])
 
-
-PHP_ARG_WITH(imap,for IMAP support,
-[  --with-imap[=DIR]         Include IMAP support. DIR is the c-client install prefix])
-
-PHP_ARG_WITH(kerberos,for IMAP Kerberos support,
-[  --with-kerberos[=DIR]     IMAP: Include Kerberos support. DIR is the Kerberos install prefix], no, no)
-
-PHP_ARG_WITH(imap-ssl,for IMAP SSL support,
-[  --with-imap-ssl[=DIR]     IMAP: Include SSL support. DIR is the OpenSSL install prefix], no, no)
-
+PHP_ARG_WITH([imap],
+  [for IMAP support],
+  [AS_HELP_STRING([[--with-imap[=DIR]]],
+    [Include IMAP support. DIR is the c-client install prefix])])
+
+PHP_ARG_WITH([kerberos],
+  [for IMAP Kerberos support],
+  [AS_HELP_STRING([[--with-kerberos[=DIR]]],
+    [IMAP: Include Kerberos support. DIR is the Kerberos install prefix])],
+  [no],
+  [no])
+
+PHP_ARG_WITH([imap-ssl],
+  [for IMAP SSL support],
+  [AS_HELP_STRING([[--with-imap-ssl[=DIR]]],
+    [IMAP: Include SSL support. DIR is the OpenSSL install prefix])],
+  [no],
+  [no])
 
 if test "$PHP_IMAP" != "no"; then
     PHP_SUBST(IMAP_SHARED_LIBADD)
diff --git a/ext/interbase/config.m4 b/ext/interbase/config.m4
index 1712f55788..74e62e893f 100644
--- a/ext/interbase/config.m4
+++ b/ext/interbase/config.m4
@@ -1,6 +1,8 @@
-PHP_ARG_WITH(interbase,for Firebird support,
-[  --with-interbase[=DIR]    Include Firebird support.  DIR is the Firebird base
-                          install directory [/opt/firebird]])
+PHP_ARG_WITH([interbase],
+  [for Firebird support],
+  [AS_HELP_STRING([[--with-interbase[=DIR]]],
+    [Include Firebird support. DIR is the Firebird base install directory
+    [/opt/firebird]])])
 
 if test "$PHP_INTERBASE" != "no"; then
 
diff --git a/ext/intl/config.m4 b/ext/intl/config.m4
index 53146b6b4e..e3cbeb17af 100644
--- a/ext/intl/config.m4
+++ b/ext/intl/config.m4
@@ -2,8 +2,10 @@ dnl config.m4 for extension intl
 
 dnl ##########################################################################
 dnl Initialize the extension
-PHP_ARG_ENABLE(intl, whether to enable internationalization support,
-[  --enable-intl           Enable internationalization support])
+PHP_ARG_ENABLE([intl],
+  [whether to enable internationalization support],
+  [AS_HELP_STRING([--enable-intl],
+    [Enable internationalization support])])
 
 if test "$PHP_INTL" != "no"; then
   PHP_SETUP_ICU(INTL_SHARED_LIBADD)
diff --git a/ext/json/config.m4 b/ext/json/config.m4
index ba255820c2..b3546046eb 100644
--- a/ext/json/config.m4
+++ b/ext/json/config.m4
@@ -1,7 +1,10 @@
 dnl config.m4 for extension json
 
-PHP_ARG_ENABLE(json, whether to enable JavaScript Object Serialization support,
-[  --disable-json          Disable JavaScript Object Serialization support], yes)
+PHP_ARG_ENABLE([json],
+  [whether to enable JavaScript Object Serialization support],
+  [AS_HELP_STRING([--disable-json],
+    [Disable JavaScript Object Serialization support])],
+  [yes])
 
 if test "$PHP_JSON" != "no"; then
   AC_DEFINE([HAVE_JSON],1 ,[whether to enable JavaScript Object Serialization support])
diff --git a/ext/ldap/config.m4 b/ext/ldap/config.m4
index 38bd8ee56d..7a0103b4a7 100644
--- a/ext/ldap/config.m4
+++ b/ext/ldap/config.m4
@@ -82,11 +82,17 @@ AC_DEFUN([PHP_LDAP_SASL_CHECKS], [
   ])
 ])
 
-PHP_ARG_WITH(ldap,for LDAP support,
-[  --with-ldap[=DIR]         Include LDAP support])
-
-PHP_ARG_WITH(ldap-sasl,for LDAP Cyrus SASL support,
-[  --with-ldap-sasl[=DIR]    LDAP: Include Cyrus SASL support], no, no)
+PHP_ARG_WITH([ldap],
+  [for LDAP support],
+  [AS_HELP_STRING([[--with-ldap[=DIR]]],
+    [Include LDAP support])])
+
+PHP_ARG_WITH([ldap-sasl],
+  [for LDAP Cyrus SASL support],
+  [AS_HELP_STRING([[--with-ldap-sasl[=DIR]]],
+    [LDAP: Include Cyrus SASL support])],
+  [no],
+  [no])
 
 if test "$PHP_LDAP" != "no"; then
 
diff --git a/ext/libxml/config0.m4 b/ext/libxml/config0.m4
index c8ad9951cb..28fd85dc3c 100644
--- a/ext/libxml/config0.m4
+++ b/ext/libxml/config0.m4
@@ -1,11 +1,18 @@
 dnl config.m4 for extension libxml
 
-PHP_ARG_ENABLE(libxml, whether to enable LIBXML support,
-[  --disable-libxml        Disable LIBXML support], yes)
+PHP_ARG_ENABLE([libxml],
+  [whether to enable LIBXML support],
+  [AS_HELP_STRING([--disable-libxml],
+    [Disable LIBXML support])],
+  [yes])
 
 if test -z "$PHP_LIBXML_DIR"; then
-  PHP_ARG_WITH(libxml-dir, libxml2 install dir,
-  [  --with-libxml-dir[=DIR]   LIBXML: libxml2 install prefix], no, no)
+  PHP_ARG_WITH([libxml-dir],
+    [libxml2 install dir],
+    [AS_HELP_STRING([[--with-libxml-dir[=DIR]]],
+      [LIBXML: libxml2 install prefix])],
+    [no],
+    [no])
 fi
 
 if test "$PHP_LIBXML" != "no"; then
diff --git a/ext/mbstring/config.m4 b/ext/mbstring/config.m4
index 456010612f..0928534c80 100644
--- a/ext/mbstring/config.m4
+++ b/ext/mbstring/config.m4
@@ -202,11 +202,17 @@ dnl
 dnl Main config
 dnl
 
-PHP_ARG_ENABLE(mbstring, whether to enable multibyte string support,
-[  --enable-mbstring       Enable multibyte string support])
-
-PHP_ARG_ENABLE([mbregex], [whether to enable multibyte regex support (requires oniguruma)],
-[  --disable-mbregex       MBSTRING: Disable multibyte regex support], yes, no)
+PHP_ARG_ENABLE([mbstring],
+  [whether to enable multibyte string support],
+  [AS_HELP_STRING([--enable-mbstring],
+    [Enable multibyte string support])])
+
+PHP_ARG_ENABLE([mbregex],
+  [whether to enable multibyte regex support (requires oniguruma)],
+  [AS_HELP_STRING([--disable-mbregex],
+    [MBSTRING: Disable multibyte regex support])],
+  [yes],
+  [no])
 
 if test "$PHP_MBSTRING" != "no"; then
   AC_DEFINE([HAVE_MBSTRING],1,[whether to have multibyte string support])
diff --git a/ext/mysqli/config.m4 b/ext/mysqli/config.m4
index 095a52f29f..31f635305a 100644
--- a/ext/mysqli/config.m4
+++ b/ext/mysqli/config.m4
@@ -27,16 +27,20 @@ AC_DEFUN([PHP_MYSQL_SOCKET_SEARCH], [
   fi
 ])
 
-PHP_ARG_WITH(mysqli, for MySQLi support,
-[  --with-mysqli[=FILE]      Include MySQLi support.  FILE is the path
-                          to mysql_config.  If no value or mysqlnd is passed
-                          as FILE, the MySQL native driver will be used])
+PHP_ARG_WITH([mysqli],
+  [for MySQLi support],
+  [AS_HELP_STRING([[--with-mysqli[=FILE]]],
+    [Include MySQLi support. FILE is the path to mysql_config. If no value or
+    mysqlnd is passed as FILE, the MySQL native driver will be used])])
 
 dnl ext/pdo_mysql/config.m4 also depends on this configure option.
-PHP_ARG_WITH(mysql-sock, for specified location of the MySQL UNIX socket,
-[  --with-mysql-sock[=SOCKPATH]
-                          MySQLi/PDO_MYSQL: Location of the MySQL unix socket pointer.
-                          If unspecified, the default locations are searched], no, no)
+PHP_ARG_WITH([mysql-sock],
+  [for specified location of the MySQL UNIX socket],
+  [AS_HELP_STRING([[--with-mysql-sock[=SOCKPATH]]],
+    [MySQLi/PDO_MYSQL: Location of the MySQL unix socket pointer. If unspecified,
+    the default locations are searched])],
+  [no],
+  [no])
 
 if test "$PHP_MYSQLI" = "yes" || test "$PHP_MYSQLI" = "mysqlnd"; then
   dnl This needs to be set in any extension which wishes to use mysqlnd
diff --git a/ext/mysqlnd/config9.m4 b/ext/mysqlnd/config9.m4
index 573190fa43..e0e2da602d 100644
--- a/ext/mysqlnd/config9.m4
+++ b/ext/mysqlnd/config9.m4
@@ -1,16 +1,27 @@
 dnl config.m4 for mysqlnd driver
 
-PHP_ARG_ENABLE(mysqlnd, whether to enable mysqlnd,
-  [  --enable-mysqlnd        Enable mysqlnd explicitly, will be done implicitly
-                          when required by other extensions], no, yes)
-
-PHP_ARG_ENABLE(mysqlnd_compression_support, whether to disable compressed protocol support in mysqlnd,
-[  --disable-mysqlnd-compression-support
-                          Disable support for the MySQL compressed protocol in mysqlnd], yes, no)
+PHP_ARG_ENABLE([mysqlnd],
+  [whether to enable mysqlnd],
+  [AS_HELP_STRING([--enable-mysqlnd],
+    [Enable mysqlnd explicitly, will be done implicitly when required by other
+    extensions])],
+  [no],
+  [yes])
+
+PHP_ARG_ENABLE([mysqlnd_compression_support],
+  [whether to disable compressed protocol support in mysqlnd],
+  [AS_HELP_STRING([--disable-mysqlnd-compression-support],
+    [Disable support for the MySQL compressed protocol in mysqlnd])],
+  [yes],
+  [no])
 
 if test -z "$PHP_ZLIB_DIR"; then
-  PHP_ARG_WITH(zlib-dir, for the location of libz,
-  [  --with-zlib-dir[=DIR]     mysqlnd: Set the path to libz install prefix], no, no)
+  PHP_ARG_WITH([zlib-dir],
+    [for the location of libz],
+    [AS_HELP_STRING([[--with-zlib-dir[=DIR]]],
+      [mysqlnd: Set the path to libz install prefix])],
+    [no],
+    [no])
 fi
 
 dnl If some extension uses mysqlnd it will get compiled in PHP core
diff --git a/ext/oci8/config.m4 b/ext/oci8/config.m4
index b554a4ac9d..00a51c815b 100644
--- a/ext/oci8/config.m4
+++ b/ext/oci8/config.m4
@@ -168,10 +168,12 @@ EOF
 dnl --with-oci8=shared,instantclient,/path/to/client/dir/lib
 dnl or
 dnl --with-oci8=shared,/path/to/oracle/home
-PHP_ARG_WITH(oci8, for Oracle Database OCI8 support,
-[  --with-oci8[=DIR]         Include Oracle Database OCI8 support. DIR defaults to [$]ORACLE_HOME.
-                          Use --with-oci8=instantclient,/path/to/instant/client/lib
-                          to use an Oracle Instant Client installation])
+PHP_ARG_WITH([oci8],
+  [for Oracle Database OCI8 support],
+  [AS_HELP_STRING([[--with-oci8[=DIR]]],
+    [Include Oracle Database OCI8 support. DIR defaults to $ORACLE_HOME. Use
+    --with-oci8=instantclient,/path/to/instant/client/lib to use an Oracle
+    Instant Client installation])])
 
 if test "$PHP_OCI8" != "no"; then
 
diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4
index 5d5456e3be..31aa1e3b8b 100644
--- a/ext/odbc/config.m4
+++ b/ext/odbc/config.m4
@@ -98,13 +98,17 @@ dnl
 dnl configure options
 dnl
 
-PHP_ARG_WITH(odbcver,,
-[  --with-odbcver[=HEX]      Force support for the passed ODBC version. A hex number is expected, default 0x0350.
-                          Use the special value of 0 to prevent an explicit ODBCVER to be defined. ], 0x0350)
+PHP_ARG_WITH([odbcver],,
+  [AS_HELP_STRING([[--with-odbcver[=HEX]]],
+    [Force support for the passed ODBC version. A hex number is expected,
+    default 0x0350. Use the special value of 0 to prevent an explicit ODBCVER to
+    be defined.])],
+  [0x0350])
 
 if test -z "$ODBC_TYPE"; then
-PHP_ARG_WITH(adabas,,
-[  --with-adabas[=DIR]       Include Adabas D support [/usr/local]])
+PHP_ARG_WITH([adabas],,
+  [AS_HELP_STRING([[--with-adabas[=DIR]]],
+    [Include Adabas D support [/usr/local]])])
 
   AC_MSG_CHECKING([for Adabas support])
   if test "$PHP_ADABAS" != "no"; then
@@ -132,8 +136,9 @@ PHP_ARG_WITH(adabas,,
 fi
 
 if test -z "$ODBC_TYPE"; then
-PHP_ARG_WITH(sapdb,,
-[  --with-sapdb[=DIR]        Include SAP DB support [/usr/local]])
+PHP_ARG_WITH([sapdb],,
+  [AS_HELP_STRING([[--with-sapdb[=DIR]]],
+    [Include SAP DB support [/usr/local]])])
 
   AC_MSG_CHECKING([for SAP DB support])
   if test "$PHP_SAPDB" != "no"; then
@@ -152,8 +157,9 @@ PHP_ARG_WITH(sapdb,,
 fi
 
 if test -z "$ODBC_TYPE"; then
-PHP_ARG_WITH(solid,,
-[  --with-solid[=DIR]        Include Solid support [/usr/local/solid]])
+PHP_ARG_WITH([solid],,
+  [AS_HELP_STRING([[--with-solid[=DIR]]],
+    [Include Solid support [/usr/local/solid]])])
 
   AC_MSG_CHECKING(for Solid support)
   if test "$PHP_SOLID" != "no"; then
@@ -179,8 +185,9 @@ PHP_ARG_WITH(solid,,
 fi
 
 if test -z "$ODBC_TYPE"; then
-PHP_ARG_WITH(ibm-db2,,
-[  --with-ibm-db2[=DIR]      Include IBM DB2 support [/home/db2inst1/sqllib]])
+PHP_ARG_WITH([ibm-db2],,
+  [AS_HELP_STRING([[--with-ibm-db2[=DIR]]],
+    [Include IBM DB2 support [/home/db2inst1/sqllib]])])
 
   AC_MSG_CHECKING(for IBM DB2 support)
   if test "$PHP_IBM_DB2" != "no"; then
@@ -218,9 +225,10 @@ You need to source your DB2 environment before running PHP configure:
 fi
 
 if test -z "$ODBC_TYPE"; then
-PHP_ARG_WITH(empress,,
-[  --with-empress[=DIR]      Include Empress support [\$EMPRESSPATH]
-                          (Empress Version >= 8.60 required)])
+PHP_ARG_WITH([empress],,
+  [AS_HELP_STRING([[--with-empress[=DIR]]],
+    [Include Empress support $EMPRESSPATH (Empress Version >= 8.60
+    required)])])
 
   AC_MSG_CHECKING(for Empress support)
   if test "$PHP_EMPRESS" != "no"; then
@@ -243,9 +251,10 @@ PHP_ARG_WITH(empress,,
 fi
 
 if test -z "$ODBC_TYPE"; then
-PHP_ARG_WITH(empress-bcs,,
-[  --with-empress-bcs[=DIR]  Include Empress Local Access support [\$EMPRESSPATH]
-                          (Empress Version >= 8.60 required)])
+PHP_ARG_WITH([empress-bcs],,
+  [AS_HELP_STRING([[--with-empress-bcs[=DIR]]],
+    [Include Empress Local Access support $EMPRESSPATH (Empress Version >=
+    8.60 required)])])
 
   AC_MSG_CHECKING(for Empress local access support)
   if test "$PHP_EMPRESS_BCS" != "no"; then
@@ -284,15 +293,14 @@ PHP_ARG_WITH(empress-bcs,,
 fi
 
 if test -z "$ODBC_TYPE"; then
-PHP_ARG_WITH(custom-odbc,,
-[  --with-custom-odbc[=DIR]  Include user defined ODBC support. DIR is ODBC install base
-                          directory [/usr/local]. Make sure to define CUSTOM_ODBC_LIBS and
-                          have some odbc.h in your include dirs. f.e. you should define
-                          following for Sybase SQL Anywhere 5.5.00 on QNX, prior to
-                          running this configure script:
-                            CPPFLAGS=\"-DODBC_QNX -DSQLANY_BUG\"
-                            LDFLAGS=-lunix
-                            CUSTOM_ODBC_LIBS=\"-ldblib -lodbc\"])
+PHP_ARG_WITH([custom-odbc],,
+  [AS_HELP_STRING([[--with-custom-odbc[=DIR]]],
+    [Include user defined ODBC support. DIR is ODBC install base directory
+    [/usr/local]. Make sure to define CUSTOM_ODBC_LIBS and have some odbc.h in
+    your include dirs. f.e. you should define following for Sybase SQL Anywhere
+    5.5.00 on QNX, prior to running this configure script:
+    CPPFLAGS="-DODBC_QNX -DSQLANY_BUG" LDFLAGS=-lunix
+    CUSTOM_ODBC_LIBS="-ldblib -lodbc"])])
 
   AC_MSG_CHECKING(for a custom ODBC support)
   if test "$PHP_CUSTOM_ODBC" != "no"; then
@@ -313,8 +321,9 @@ PHP_ARG_WITH(custom-odbc,,
 fi
 
 if test -z "$ODBC_TYPE"; then
-PHP_ARG_WITH(iodbc,,
-[  --with-iodbc[=DIR]        Include iODBC support [/usr/local]])
+PHP_ARG_WITH([iodbc],,
+  [AS_HELP_STRING([[--with-iodbc[=DIR]]],
+    [Include iODBC support [/usr/local]])])
 
   AC_MSG_CHECKING(for iODBC support)
   if test "$PHP_IODBC" != "no"; then
@@ -351,8 +360,9 @@ PHP_ARG_WITH(iodbc,,
 fi
 
 if test -z "$ODBC_TYPE"; then
-PHP_ARG_WITH(esoob,,
-[  --with-esoob[=DIR]        Include Easysoft OOB support [/usr/local/easysoft/oob/client]])
+PHP_ARG_WITH([esoob],,
+  [AS_HELP_STRING([[--with-esoob[=DIR]]],
+    [Include Easysoft OOB support [/usr/local/easysoft/oob/client]])])
 
   AC_MSG_CHECKING(for Easysoft ODBC-ODBC Bridge support)
   if test "$PHP_ESOOB" != "no"; then
@@ -373,8 +383,9 @@ PHP_ARG_WITH(esoob,,
 fi
 
 if test -z "$ODBC_TYPE"; then
-PHP_ARG_WITH(unixODBC,,
-[  --with-unixODBC[=DIR]     Include unixODBC support [/usr/local]])
+PHP_ARG_WITH([unixODBC],,
+  [AS_HELP_STRING([[--with-unixODBC[=DIR]]],
+    [Include unixODBC support [/usr/local]])])
 
   AC_MSG_CHECKING(for unixODBC support)
   if test "$PHP_UNIXODBC" != "no"; then
@@ -396,8 +407,9 @@ PHP_ARG_WITH(unixODBC,,
 fi
 
 if test -z "$ODBC_TYPE"; then
-PHP_ARG_WITH(dbmaker,,
-[  --with-dbmaker[=DIR]      Include DBMaker support])
+PHP_ARG_WITH([dbmaker],,
+  [AS_HELP_STRING([[--with-dbmaker[=DIR]]],
+    [Include DBMaker support])])
 
   AC_MSG_CHECKING(for DBMaker support)
   if test "$PHP_DBMAKER" != "no"; then
diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4
index 8fefd5b5a2..a137c61630 100644
--- a/ext/opcache/config.m4
+++ b/ext/opcache/config.m4
@@ -1,11 +1,17 @@
 dnl config.m4 for extension opcache
 
-PHP_ARG_ENABLE(opcache, whether to enable Zend OPcache support,
-[  --disable-opcache       Disable Zend OPcache support], yes)
-
-PHP_ARG_ENABLE(huge-code-pages, whether to enable copying PHP CODE pages into HUGE PAGES,
-[  --disable-huge-code-pages
-                          Disable copying PHP CODE pages into HUGE PAGES], yes, no)
+PHP_ARG_ENABLE([opcache],
+  [whether to enable Zend OPcache support],
+  [AS_HELP_STRING([--disable-opcache],
+    [Disable Zend OPcache support])],
+  [yes])
+
+PHP_ARG_ENABLE([huge-code-pages],
+  [whether to enable copying PHP CODE pages into HUGE PAGES],
+  [AS_HELP_STRING([--disable-huge-code-pages],
+    [Disable copying PHP CODE pages into HUGE PAGES])],
+  [yes],
+  [no])
 
 if test "$PHP_OPCACHE" != "no"; then
 
diff --git a/ext/openssl/config0.m4 b/ext/openssl/config0.m4
index 3b5836f1f8..df90e05ba3 100644
--- a/ext/openssl/config0.m4
+++ b/ext/openssl/config0.m4
@@ -1,13 +1,23 @@
 dnl config.m4 for extension openssl
 
-PHP_ARG_WITH(openssl, for OpenSSL support,
-[  --with-openssl            Include OpenSSL support (requires OpenSSL >= 1.0.1)])
+PHP_ARG_WITH([openssl],
+  [for OpenSSL support],
+  [AS_HELP_STRING([--with-openssl],
+    [Include OpenSSL support (requires OpenSSL >= 1.0.1)])])
 
-PHP_ARG_WITH(kerberos, for Kerberos support,
-[  --with-kerberos[=DIR]     OPENSSL: Include Kerberos support], no, no)
+PHP_ARG_WITH([kerberos],
+  [for Kerberos support],
+  [AS_HELP_STRING([[--with-kerberos[=DIR]]],
+    [OPENSSL: Include Kerberos support])],
+  [no],
+  [no])
 
-PHP_ARG_WITH(system-ciphers, whether to use system default cipher list instead of hardcoded value,
-[  --with-system-ciphers   OPENSSL: Use system default cipher list instead of hardcoded value], no, no)
+PHP_ARG_WITH([system-ciphers],
+  [whether to use system default cipher list instead of hardcoded value],
+  [AS_HELP_STRING([--with-system-ciphers],
+    [OPENSSL: Use system default cipher list instead of hardcoded value])],
+  [no],
+  [no])
 
 if test "$PHP_OPENSSL" != "no"; then
   PHP_NEW_EXTENSION(openssl, openssl.c xp_ssl.c, $ext_shared)
diff --git a/ext/pcntl/config.m4 b/ext/pcntl/config.m4
index 41fd0f2ad1..1c83a1b671 100644
--- a/ext/pcntl/config.m4
+++ b/ext/pcntl/config.m4
@@ -1,7 +1,9 @@
 dnl config.m4 for extension pcntl
 
-PHP_ARG_ENABLE(pcntl, whether to enable pcntl support,
-[  --enable-pcntl          Enable pcntl support (CLI/CGI only)])
+PHP_ARG_ENABLE([pcntl],
+  [whether to enable pcntl support],
+  [AS_HELP_STRING([--enable-pcntl],
+    [Enable pcntl support (CLI/CGI only)])])
 
 if test "$PHP_PCNTL" != "no"; then
   AC_CHECK_FUNCS(fork, [ AC_DEFINE(HAVE_FORK,1,[ ]) ], [ AC_MSG_ERROR(pcntl: fork() not supported by this platform) ])
diff --git a/ext/pcre/config0.m4 b/ext/pcre/config0.m4
index 27ecbc414f..2ae174b479 100644
--- a/ext/pcre/config0.m4
+++ b/ext/pcre/config0.m4
@@ -3,10 +3,17 @@ dnl config.m4 for extension pcre
 dnl By default we'll compile and link against the bundled PCRE library
 dnl if DIR is supplied, we'll use that for linking
 
-PHP_ARG_WITH(external-pcre,,
-[  --with-external-pcre    Use external library for PCRE support], no, no)
+PHP_ARG_WITH([external-pcre],,
+  [AS_HELP_STRING([--with-external-pcre],
+    [Use external library for PCRE support])],
+  [no],
+  [no])
 
-PHP_ARG_WITH(pcre-jit,,[  --with-pcre-jit         Enable PCRE JIT functionality], yes, no)
+PHP_ARG_WITH([pcre-jit],,
+  [AS_HELP_STRING([--with-pcre-jit],
+    [Enable PCRE JIT functionality])],
+  [yes],
+  [no])
 
 if test "$PHP_EXTERNAL_PCRE" != "no"; then
 
@@ -77,8 +84,12 @@ else
   fi
 fi
 
-PHP_ARG_WITH(pcre-valgrind,,[  --with-pcre-valgrind=DIR
-                          Enable PCRE valgrind support. Developers only!], no, no)
+PHP_ARG_WITH([pcre-valgrind],,
+  [AS_HELP_STRING([--with-pcre-valgrind=DIR],
+    [Enable PCRE valgrind support. Developers only!])],
+  [no],
+  [no])
+
   if test "$PHP_EXTERNAL_PCRE" != "no"; then
     AC_MSG_WARN([PHP is going to be linked with an external PCRE, --with-pcre-valgrind has no effect])
   else
diff --git a/ext/pdo/config.m4 b/ext/pdo/config.m4
index 954f94ff5f..ad02f36e3a 100644
--- a/ext/pdo/config.m4
+++ b/ext/pdo/config.m4
@@ -1,7 +1,10 @@
 dnl config.m4 for extension pdo
 
-PHP_ARG_ENABLE(pdo, whether to enable PDO support,
-[  --disable-pdo           Disable PHP Data Objects support], yes)
+PHP_ARG_ENABLE([pdo],
+  [whether to enable PDO support],
+  [AS_HELP_STRING([--disable-pdo],
+    [Disable PHP Data Objects support])],
+  [yes])
 
 if test "$PHP_PDO" != "no"; then
 
diff --git a/ext/pdo_dblib/config.m4 b/ext/pdo_dblib/config.m4
index 3f2bcc477d..de770d4e58 100644
--- a/ext/pdo_dblib/config.m4
+++ b/ext/pdo_dblib/config.m4
@@ -1,7 +1,9 @@
 dnl config.m4 for extension pdo_dblib
 
-PHP_ARG_WITH(pdo-dblib, for PDO_DBLIB support via FreeTDS,
-[  --with-pdo-dblib[=DIR]    PDO: DBLIB-DB support.  DIR is the FreeTDS home directory])
+PHP_ARG_WITH([pdo-dblib],
+  [for PDO_DBLIB support via FreeTDS],
+  [AS_HELP_STRING([[--with-pdo-dblib[=DIR]]],
+    [PDO: DBLIB-DB support. DIR is the FreeTDS home directory])])
 
 if test "$PHP_PDO_DBLIB" != "no"; then
 
diff --git a/ext/pdo_firebird/config.m4 b/ext/pdo_firebird/config.m4
index 0f7f3c7be8..594e7c220e 100644
--- a/ext/pdo_firebird/config.m4
+++ b/ext/pdo_firebird/config.m4
@@ -1,6 +1,8 @@
-PHP_ARG_WITH(pdo-firebird,for Firebird support for PDO,
-[  --with-pdo-firebird[=DIR] PDO: Firebird support.  DIR is the Firebird base
-                          install directory [/opt/firebird]])
+PHP_ARG_WITH([pdo-firebird],
+  [for Firebird support for PDO],
+  [AS_HELP_STRING([[--with-pdo-firebird[=DIR]]],
+    [PDO: Firebird support. DIR is the Firebird base install directory
+    [/opt/firebird]])])
 
 if test "$PHP_PDO_FIREBIRD" != "no"; then
 
diff --git a/ext/pdo_mysql/config.m4 b/ext/pdo_mysql/config.m4
index 4634626ae3..d638f03a28 100644
--- a/ext/pdo_mysql/config.m4
+++ b/ext/pdo_mysql/config.m4
@@ -1,13 +1,18 @@
 dnl config.m4 for extension pdo_mysql
 
-PHP_ARG_WITH(pdo-mysql, for MySQL support for PDO,
-[  --with-pdo-mysql[=DIR]    PDO: MySQL support. DIR is the MySQL base directory
-                          If no value or mysqlnd is passed as DIR, the
-                          MySQL native driver will be used])
+PHP_ARG_WITH([pdo-mysql],
+  [for MySQL support for PDO],
+  [AS_HELP_STRING([[--with-pdo-mysql[=DIR]]],
+    [PDO: MySQL support. DIR is the MySQL base directory. If no value or mysqlnd
+    is passed as DIR, the MySQL native driver will be used])])
 
 if test -z "$PHP_ZLIB_DIR"; then
-  PHP_ARG_WITH(zlib-dir, for the location of libz,
-  [  --with-zlib-dir[=DIR]     PDO_MySQL: Set the path to libz install prefix], no, no)
+  PHP_ARG_WITH([zlib-dir],
+    [for the location of libz],
+    [AS_HELP_STRING([[--with-zlib-dir[=DIR]]],
+      [PDO_MySQL: Set the path to libz install prefix])],
+    [no],
+    [no])
 fi
 
 if test "$PHP_PDO_MYSQL" != "no"; then
diff --git a/ext/pdo_oci/config.m4 b/ext/pdo_oci/config.m4
index 5276a2af5f..12791b2fe0 100644
--- a/ext/pdo_oci/config.m4
+++ b/ext/pdo_oci/config.m4
@@ -53,10 +53,12 @@ AC_DEFUN([AC_PDO_OCI_CHECK_LIB_DIR],[
   AC_MSG_RESULT($PDO_OCI_LIB_DIR)
 ])
 
-PHP_ARG_WITH(pdo-oci, Oracle OCI support for PDO,
-[  --with-pdo-oci[=DIR]      PDO: Oracle OCI support. DIR defaults to [$]ORACLE_HOME.
-                          Use --with-pdo-oci=instantclient,/path/to/instant/client/lib
-                          for an Oracle Instant Client installation.])
+PHP_ARG_WITH([pdo-oci],
+  [Oracle OCI support for PDO],
+  [AS_HELP_STRING([[--with-pdo-oci[=DIR]]],
+    [PDO: Oracle OCI support. DIR defaults to $ORACLE_HOME. Use
+    --with-pdo-oci=instantclient,/path/to/instant/client/lib for an Oracle
+    Instant Client installation.])])
 
 if test "$PHP_PDO_OCI" != "no"; then
 
diff --git a/ext/pdo_odbc/config.m4 b/ext/pdo_odbc/config.m4
index 2f875d43de..7c1c469525 100644
--- a/ext/pdo_odbc/config.m4
+++ b/ext/pdo_odbc/config.m4
@@ -1,26 +1,18 @@
 dnl config.m4 for extension pdo_odbc
 
 define([PDO_ODBC_HELP_TEXT],[[
-			  include and lib dirs are looked for under 'dir'.
-
-			  'flavour' can be one of:  ibm-db2, iODBC, unixODBC, generic
-			  If ',dir' part is omitted, default for the flavour
-			  you have selected will be used. e.g.:
-
-			    --with-pdo-odbc=unixODBC
-
-			  will check for unixODBC under /usr/local. You may attempt
-			  to use an otherwise unsupported driver using the 'generic'
-			  flavour.  The syntax for generic ODBC support is:
-
-			    --with-pdo-odbc=generic,dir,libname,ldflags,cflags
-
-			  When built as 'shared' the extension filename is always pdo_odbc.so]])
-
-PHP_ARG_WITH(pdo-odbc, for ODBC v3 support for PDO,
-[  --with-pdo-odbc=flavour,dir
-                          PDO: Support for 'flavour' ODBC driver.]PDO_ODBC_HELP_TEXT)
-
+  The include and lib dirs are looked for under 'dir'. The 'flavour' can be one
+  of: ibm-db2, iODBC, unixODBC, generic. If ',dir' part is omitted, default for
+  the flavour you have selected will be used. e.g.: --with-pdo-odbc=unixODBC
+  will check for unixODBC under /usr/local. You may attempt to use an otherwise
+  unsupported driver using the 'generic' flavour. The syntax for generic ODBC
+  support is: --with-pdo-odbc=generic,dir,libname,ldflags,cflags. When built as
+  'shared' the extension filename is always pdo_odbc.so]])
+
+PHP_ARG_WITH([pdo-odbc],
+  [for ODBC v3 support for PDO],
+  [AS_HELP_STRING([--with-pdo-odbc=flavour,dir],
+    [PDO: Support for 'flavour' ODBC driver.]PDO_ODBC_HELP_TEXT)])
 
 AC_DEFUN([PDO_ODBC_CHECK_HEADER],[
   AC_MSG_CHECKING([for $1 in $PDO_ODBC_INCDIR])
diff --git a/ext/pdo_pgsql/config.m4 b/ext/pdo_pgsql/config.m4
index ad7bb91222..a2ab91306a 100644
--- a/ext/pdo_pgsql/config.m4
+++ b/ext/pdo_pgsql/config.m4
@@ -1,8 +1,10 @@
 dnl config.m4 for extension pdo_pgsql
 
-PHP_ARG_WITH(pdo-pgsql,for PostgreSQL support for PDO,
-[  --with-pdo-pgsql[=DIR]    PDO: PostgreSQL support.  DIR is the PostgreSQL base
-                          install directory or the path to pg_config])
+PHP_ARG_WITH([pdo-pgsql],
+  [for PostgreSQL support for PDO],
+  [AS_HELP_STRING([[--with-pdo-pgsql[=DIR]]],
+    [PDO: PostgreSQL support. DIR is the PostgreSQL base install directory or
+    the path to pg_config])])
 
 if test "$PHP_PDO_PGSQL" != "no"; then
 
diff --git a/ext/pdo_sqlite/config.m4 b/ext/pdo_sqlite/config.m4
index 202cfeb4ae..c426eaf137 100644
--- a/ext/pdo_sqlite/config.m4
+++ b/ext/pdo_sqlite/config.m4
@@ -1,9 +1,11 @@
 dnl config.m4 for extension pdo_sqlite
 
-PHP_ARG_WITH(pdo-sqlite, for sqlite 3 support for PDO,
-[  --without-pdo-sqlite[=DIR]
-                          PDO: sqlite 3 support.  DIR is the sqlite base
-                          install directory [BUNDLED]], $PHP_PDO)
+PHP_ARG_WITH([pdo-sqlite],
+  [for sqlite 3 support for PDO],
+  [AS_HELP_STRING([[--without-pdo-sqlite[=DIR]]],
+    [PDO: sqlite 3 support. DIR is the sqlite base install directory
+    [BUNDLED]])],
+  [$PHP_PDO])
 
 if test "$PHP_PDO_SQLITE" != "no"; then
 
diff --git a/ext/pgsql/config.m4 b/ext/pgsql/config.m4
index 44860ee993..e1103f4f89 100644
--- a/ext/pgsql/config.m4
+++ b/ext/pgsql/config.m4
@@ -1,8 +1,10 @@
 dnl config.m4 for extension pgsql
 
-PHP_ARG_WITH(pgsql,for PostgreSQL support,
-[  --with-pgsql[=DIR]        Include PostgreSQL support.  DIR is the PostgreSQL
-                          base install directory or the path to pg_config])
+PHP_ARG_WITH([pgsql],
+  [for PostgreSQL support],
+  [AS_HELP_STRING([[--with-pgsql[=DIR]]],
+    [Include PostgreSQL support. DIR is the PostgreSQL base install directory or
+    the path to pg_config])])
 
 if test "$PHP_PGSQL" != "no"; then
   PHP_EXPAND_PATH($PGSQL_INCLUDE, PGSQL_INCLUDE)
diff --git a/ext/phar/config.m4 b/ext/phar/config.m4
index 31a0a81b76..eb23bbf794 100644
--- a/ext/phar/config.m4
+++ b/ext/phar/config.m4
@@ -1,7 +1,10 @@
 dnl config.m4 for extension phar
 
-PHP_ARG_ENABLE(phar, for phar archive support,
-[  --disable-phar          Disable phar support], yes)
+PHP_ARG_ENABLE([phar],
+  [for phar archive support],
+  [AS_HELP_STRING([--disable-phar],
+    [Disable phar support])],
+  [yes])
 
 if test "$PHP_PHAR" != "no"; then
   PHP_NEW_EXTENSION(phar, util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
diff --git a/ext/posix/config.m4 b/ext/posix/config.m4
index dccdcd69a4..f56f6c60cd 100644
--- a/ext/posix/config.m4
+++ b/ext/posix/config.m4
@@ -1,7 +1,10 @@
 dnl config.m4 for extension posix
 
-PHP_ARG_ENABLE(posix,whether to enable POSIX-like functions,
-[  --disable-posix         Disable POSIX-like functions], yes)
+PHP_ARG_ENABLE([posix],
+  [whether to enable POSIX-like functions],
+  [AS_HELP_STRING([--disable-posix],
+    [Disable POSIX-like functions])],
+  [yes])
 
 if test "$PHP_POSIX" = "yes"; then
   AC_DEFINE(HAVE_POSIX, 1, [whether to include POSIX-like functions])
diff --git a/ext/pspell/config.m4 b/ext/pspell/config.m4
index ec779502bc..59ec3a9e7f 100644
--- a/ext/pspell/config.m4
+++ b/ext/pspell/config.m4
@@ -1,8 +1,9 @@
 dnl config.m4 for extension pspell
 
-PHP_ARG_WITH(pspell,for PSPELL support,
-[  --with-pspell[=DIR]       Include PSPELL support.
-                          GNU Aspell version 0.50.0 or higher required])
+PHP_ARG_WITH([pspell],
+  [for PSPELL support],
+  [AS_HELP_STRING([[--with-pspell[=DIR]]],
+    [Include PSPELL support. GNU Aspell version 0.50.0 or higher required])])
 
 if test "$PHP_PSPELL" != "no"; then
 	PHP_NEW_EXTENSION(pspell, pspell.c, $ext_shared)
diff --git a/ext/readline/config.m4 b/ext/readline/config.m4
index 21f4f63b04..7001a15372 100644
--- a/ext/readline/config.m4
+++ b/ext/readline/config.m4
@@ -1,11 +1,15 @@
 dnl config.m4 for extension readline
 
-PHP_ARG_WITH(libedit,for libedit readline replacement,
-[  --with-libedit          Include libedit readline replacement (CLI/CGI only)])
+PHP_ARG_WITH([libedit],
+  [for libedit readline replacement],
+  [AS_HELP_STRING([--with-libedit],
+    [Include libedit readline replacement (CLI/CGI only)])])
 
 if test "$PHP_LIBEDIT" = "no"; then
-  PHP_ARG_WITH(readline,for readline support,
-  [  --with-readline[=DIR]     Include readline support (CLI/CGI only)])
+  PHP_ARG_WITH([readline],
+    [for readline support],
+    [AS_HELP_STRING([[--with-readline[=DIR]]],
+      [Include readline support (CLI/CGI only)])])
 else
   dnl "register" the --with-readline option to preven invalid "unknown configure option" warning
   php_with_readline=no
diff --git a/ext/recode/config.m4 b/ext/recode/config.m4
index bb627d4a7a..8507577607 100644
--- a/ext/recode/config.m4
+++ b/ext/recode/config.m4
@@ -1,7 +1,9 @@
 dnl config.m4 for extension recode
 
-PHP_ARG_WITH(recode,for recode support,
-[  --with-recode[=DIR]       Include recode support])
+PHP_ARG_WITH([recode],
+  [for recode support],
+  [AS_HELP_STRING([[--with-recode[=DIR]]],
+    [Include recode support])])
 
 if test "$PHP_RECODE" != "no"; then
   RECODE_LIST="$PHP_RECODE /usr/local /usr /opt"
diff --git a/ext/session/config.m4 b/ext/session/config.m4
index 82e94342f3..dfb0372529 100644
--- a/ext/session/config.m4
+++ b/ext/session/config.m4
@@ -1,10 +1,17 @@
 dnl config.m4 for extension session
 
-PHP_ARG_ENABLE(session, whether to enable PHP sessions,
-[  --disable-session       Disable session support], yes)
+PHP_ARG_ENABLE([session],
+  [whether to enable PHP sessions],
+  [AS_HELP_STRING([--disable-session],
+    [Disable session support])],
+  [yes])
 
-PHP_ARG_WITH(mm,for mm support,
-[  --with-mm[=DIR]           SESSION: Include mm support for session storage], no, no)
+PHP_ARG_WITH([mm],
+  [for mm support],
+  [AS_HELP_STRING([[--with-mm[=DIR]]],
+    [SESSION: Include mm support for session storage])],
+  [no],
+  [no])
 
 if test "$PHP_SESSION" != "no"; then
   PHP_PWRITE_TEST
diff --git a/ext/shmop/config.m4 b/ext/shmop/config.m4
index 79642f37d9..35c58b906e 100644
--- a/ext/shmop/config.m4
+++ b/ext/shmop/config.m4
@@ -1,7 +1,9 @@
 dnl config.m4 for extension shmop
 
-PHP_ARG_ENABLE(shmop, whether to enable shmop support,
-[  --enable-shmop          Enable shmop support])
+PHP_ARG_ENABLE([shmop],
+  [whether to enable shmop support],
+  [AS_HELP_STRING([--enable-shmop],
+    [Enable shmop support])])
 
 if test "$PHP_SHMOP" != "no"; then
   AC_DEFINE(HAVE_SHMOP, 1, [ ])
diff --git a/ext/simplexml/config.m4 b/ext/simplexml/config.m4
index f05a477259..a79d6af5e7 100644
--- a/ext/simplexml/config.m4
+++ b/ext/simplexml/config.m4
@@ -1,11 +1,18 @@
 dnl config.m4 for extension simplexml
 
-PHP_ARG_ENABLE(simplexml, whether to enable SimpleXML support,
-[  --disable-simplexml     Disable SimpleXML support], yes)
+PHP_ARG_ENABLE([simplexml],
+  [whether to enable SimpleXML support],
+  [AS_HELP_STRING([--disable-simplexml],
+    [Disable SimpleXML support])],
+  [yes])
 
 if test -z "$PHP_LIBXML_DIR"; then
-  PHP_ARG_WITH(libxml-dir, libxml2 install dir,
-  [  --with-libxml-dir=DIR   SimpleXML: libxml2 install prefix], no, no)
+  PHP_ARG_WITH([libxml-dir],
+    [libxml2 install dir],
+    [AS_HELP_STRING([--with-libxml-dir=DIR],
+      [SimpleXML: libxml2 install prefix])],
+    [no],
+    [no])
 fi
 
 if test "$PHP_SIMPLEXML" != "no"; then
diff --git a/ext/skeleton/config.m4.in b/ext/skeleton/config.m4.in
index e6b34a8eeb..0911c60aa0 100644
--- a/ext/skeleton/config.m4.in
+++ b/ext/skeleton/config.m4.in
@@ -5,15 +5,18 @@ dnl Remove where necessary.
 
 dnl If your extension references something external, use with:
 
-dnl PHP_ARG_WITH(%EXTNAME%, for %EXTNAME% support,
-dnl Make sure that the comment is aligned:
-dnl [  --with-%EXTNAME%             Include %EXTNAME% support])
+dnl PHP_ARG_WITH([%EXTNAME%],
+dnl   [for %EXTNAME% support],
+dnl   [AS_HELP_STRING([--with-%EXTNAME%],
+dnl     [Include %EXTNAME% support])])
 
 dnl Otherwise use enable:
 
-PHP_ARG_ENABLE(%EXTNAME%, whether to enable %EXTNAME% support,
-dnl Make sure that the comment is aligned:
-[  --enable-%EXTNAME%          Enable %EXTNAME% support], no)
+PHP_ARG_ENABLE([%EXTNAME%],
+  [whether to enable %EXTNAME% support],
+  [AS_HELP_STRING([--enable-%EXTNAME%],
+    [Enable %EXTNAME% support])],
+  [no])
 
 if test "$PHP_%EXTNAMECAPS%" != "no"; then
   dnl Write more examples of tests here...
diff --git a/ext/snmp/config.m4 b/ext/snmp/config.m4
index 2b82623212..4715259689 100644
--- a/ext/snmp/config.m4
+++ b/ext/snmp/config.m4
@@ -1,10 +1,16 @@
 dnl config.m4 for extension snmp
 
-PHP_ARG_WITH(snmp,for SNMP support,
-[  --with-snmp[=DIR]         Include SNMP support])
+PHP_ARG_WITH([snmp],
+  [for SNMP support],
+  [AS_HELP_STRING([[--with-snmp[=DIR]]],
+    [Include SNMP support])])
 
-PHP_ARG_WITH(openssl-dir,OpenSSL dir for SNMP,
-[  --with-openssl-dir[=DIR]  SNMP: openssl install prefix], no, no)
+PHP_ARG_WITH([openssl-dir],
+  [OpenSSL dir for SNMP],
+  [AS_HELP_STRING([[--with-openssl-dir[=DIR]]],
+    [SNMP: openssl install prefix])],
+  [no],
+  [no])
 
 if test "$PHP_SNMP" != "no"; then
 
diff --git a/ext/soap/config.m4 b/ext/soap/config.m4
index d0a99d9624..8ca7eb3156 100644
--- a/ext/soap/config.m4
+++ b/ext/soap/config.m4
@@ -1,11 +1,17 @@
 dnl config.m4 for extension soap
 
-PHP_ARG_ENABLE(soap, whether to enable SOAP support,
-[  --enable-soap           Enable SOAP support])
+PHP_ARG_ENABLE([soap],
+  [whether to enable SOAP support],
+  [AS_HELP_STRING([--enable-soap],
+    [Enable SOAP support])])
 
 if test -z "$PHP_LIBXML_DIR"; then
-  PHP_ARG_WITH(libxml-dir, libxml2 install dir,
-  [  --with-libxml-dir=DIR   SOAP: libxml2 install prefix], no, no)
+  PHP_ARG_WITH([libxml-dir],
+    [libxml2 install dir],
+    [AS_HELP_STRING([--with-libxml-dir=DIR],
+      [SOAP: libxml2 install prefix])],
+    [no],
+    [no])
 fi
 
 if test "$PHP_SOAP" != "no"; then
diff --git a/ext/sockets/config.m4 b/ext/sockets/config.m4
index e5602a4789..f5642fc2c8 100644
--- a/ext/sockets/config.m4
+++ b/ext/sockets/config.m4
@@ -1,7 +1,9 @@
 dnl config.m4 for extension sockets
 
-PHP_ARG_ENABLE(sockets, whether to enable sockets support,
-[  --enable-sockets        Enable sockets support])
+PHP_ARG_ENABLE([sockets],
+  [whether to enable sockets support],
+  [AS_HELP_STRING([--enable-sockets],
+    [Enable sockets support])])
 
 if test "$PHP_SOCKETS" != "no"; then
   dnl Check for struct cmsghdr
diff --git a/ext/sodium/config.m4 b/ext/sodium/config.m4
index d9061c53d1..42da137b81 100644
--- a/ext/sodium/config.m4
+++ b/ext/sodium/config.m4
@@ -1,7 +1,9 @@
 dnl config.m4 for extension sodium
 
-PHP_ARG_WITH(sodium, for sodium support,
-[  --with-sodium[=DIR]       Include sodium support])
+PHP_ARG_WITH([sodium],
+  [for sodium support],
+  [AS_HELP_STRING([[--with-sodium[=DIR]]],
+    [Include sodium support])])
 
 if test "$PHP_SODIUM" != "no"; then
   SEARCH_PATH="/usr/local /usr"     # you might want to change this
diff --git a/ext/sqlite3/config0.m4 b/ext/sqlite3/config0.m4
index b4ae84ea21..d6aaf13095 100644
--- a/ext/sqlite3/config0.m4
+++ b/ext/sqlite3/config0.m4
@@ -1,8 +1,11 @@
 dnl config.m4 for extension sqlite3
 
-PHP_ARG_WITH(sqlite3, whether to enable the SQLite3 extension,
-[  --without-sqlite3[=DIR]   Do not include SQLite3 support. DIR is the prefix to
-                          SQLite3 installation directory.], yes)
+PHP_ARG_WITH([sqlite3],
+  [whether to enable the SQLite3 extension],
+  [AS_HELP_STRING([[--without-sqlite3[=DIR]]],
+    [Do not include SQLite3 support. DIR is the prefix to SQLite3 installation
+    directory.])],
+  [yes])
 
 if test $PHP_SQLITE3 != "no"; then
   PHP_SQLITE3_CFLAGS=" -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 "
diff --git a/ext/standard/config.m4 b/ext/standard/config.m4
index fe6303eff3..f3c90754ac 100644
--- a/ext/standard/config.m4
+++ b/ext/standard/config.m4
@@ -407,9 +407,11 @@ AC_CHECK_DECLS([arc4random_buf])
 dnl
 dnl Check for argon2
 dnl
-PHP_ARG_WITH(password-argon2, for Argon2 support,
-[  --with-password-argon2[=DIR]
-                          Include Argon2 support in password_*. DIR is the Argon2 shared library path])
+PHP_ARG_WITH([password-argon2],
+  [for Argon2 support],
+  [AS_HELP_STRING([[--with-password-argon2[=DIR]]],
+    [Include Argon2 support in password_*. DIR is the Argon2 shared library
+    path])])
 
 if test "$PHP_PASSWORD_ARGON2" != "no"; then
   AC_MSG_CHECKING([for Argon2 library])
diff --git a/ext/sysvmsg/config.m4 b/ext/sysvmsg/config.m4
index e14fd2d634..3731fe9940 100644
--- a/ext/sysvmsg/config.m4
+++ b/ext/sysvmsg/config.m4
@@ -1,7 +1,9 @@
 dnl config.m4 for extension sysvmsg
 
-PHP_ARG_ENABLE(sysvmsg,whether to enable System V IPC support,
-[  --enable-sysvmsg        Enable sysvmsg support])
+PHP_ARG_ENABLE([sysvmsg],
+  [whether to enable System V IPC support],
+  [AS_HELP_STRING([--enable-sysvmsg],
+    [Enable sysvmsg support])])
 
 if test "$PHP_SYSVMSG" != "no"; then
   AC_CHECK_HEADER([sys/msg.h],
diff --git a/ext/sysvsem/config.m4 b/ext/sysvsem/config.m4
index a10a85fa15..a091cb2a7f 100644
--- a/ext/sysvsem/config.m4
+++ b/ext/sysvsem/config.m4
@@ -1,7 +1,9 @@
 dnl config.m4 for extension sysvsem
 
-PHP_ARG_ENABLE(sysvsem,whether to enable System V semaphore support,
-[  --enable-sysvsem        Enable System V semaphore support])
+PHP_ARG_ENABLE([sysvsem],
+  [whether to enable System V semaphore support],
+  [AS_HELP_STRING([--enable-sysvsem],
+    [Enable System V semaphore support])])
 
 if test "$PHP_SYSVSEM" != "no"; then
  PHP_NEW_EXTENSION(sysvsem, sysvsem.c, $ext_shared)
diff --git a/ext/sysvshm/config.m4 b/ext/sysvshm/config.m4
index d5c033f12d..7426c6bab6 100644
--- a/ext/sysvshm/config.m4
+++ b/ext/sysvshm/config.m4
@@ -1,7 +1,9 @@
 dnl config.m4 for extension sysvshm
 
-PHP_ARG_ENABLE(sysvshm,whether to enable System V shared memory support,
-[  --enable-sysvshm        Enable the System V shared memory support])
+PHP_ARG_ENABLE([sysvshm],
+  [whether to enable System V shared memory support],
+  [AS_HELP_STRING([--enable-sysvshm],
+    [Enable the System V shared memory support])])
 
 if test "$PHP_SYSVSHM" != "no"; then
   AC_DEFINE(HAVE_SYSVSHM, 1, [ ])
diff --git a/ext/tidy/config.m4 b/ext/tidy/config.m4
index ef9aa02195..31103c5c8b 100644
--- a/ext/tidy/config.m4
+++ b/ext/tidy/config.m4
@@ -1,7 +1,9 @@
 dnl config.m4 for extension tidy
 
-PHP_ARG_WITH(tidy,for TIDY support,
-[  --with-tidy[=DIR]         Include TIDY support])
+PHP_ARG_WITH([tidy],
+  [for TIDY support],
+  [AS_HELP_STRING([[--with-tidy[=DIR]]],
+    [Include TIDY support])])
 
 if test "$PHP_TIDY" != "no"; then
 
diff --git a/ext/tokenizer/config.m4 b/ext/tokenizer/config.m4
index 3527f725fa..76f5039253 100644
--- a/ext/tokenizer/config.m4
+++ b/ext/tokenizer/config.m4
@@ -2,8 +2,11 @@ dnl config.m4 for extension tokenizer
 
 dnl Otherwise use enable:
 
-PHP_ARG_ENABLE(tokenizer, whether to enable tokenizer support,
-[  --disable-tokenizer     Disable tokenizer support], yes)
+PHP_ARG_ENABLE([tokenizer],
+  [whether to enable tokenizer support],
+  [AS_HELP_STRING([--disable-tokenizer],
+    [Disable tokenizer support])],
+  [yes])
 
 if test "$PHP_TOKENIZER" != "no"; then
   PHP_NEW_EXTENSION(tokenizer, tokenizer.c tokenizer_data.c, $ext_shared)
diff --git a/ext/wddx/config.m4 b/ext/wddx/config.m4
index 332036b827..548009ec14 100644
--- a/ext/wddx/config.m4
+++ b/ext/wddx/config.m4
@@ -1,15 +1,25 @@
 dnl config.m4 for extension wddx
 
-PHP_ARG_ENABLE(wddx,whether to enable WDDX support,
-[  --enable-wddx           Enable WDDX support])
+PHP_ARG_ENABLE([wddx],
+  [whether to enable WDDX support],
+  [AS_HELP_STRING([--enable-wddx],
+    [Enable WDDX support])])
 
 if test -z "$PHP_LIBXML_DIR"; then
-  PHP_ARG_WITH(libxml-dir, libxml2 install dir,
-  [  --with-libxml-dir=DIR   WDDX: libxml2 install prefix], no, no)
+  PHP_ARG_WITH([libxml-dir],
+    [libxml2 install dir],
+    [AS_HELP_STRING([--with-libxml-dir=DIR],
+      [WDDX: libxml2 install prefix])],
+    [no],
+    [no])
 fi
 
-PHP_ARG_WITH(libexpat-dir, libexpat dir for WDDX,
-[  --with-libexpat-dir=DIR WDDX: libexpat dir for XMLRPC-EPI (deprecated)],no,no)
+PHP_ARG_WITH([libexpat-dir],
+  [libexpat dir for WDDX],
+  [AS_HELP_STRING([--with-libexpat-dir=DIR],
+    [WDDX: libexpat dir for XMLRPC-EPI (deprecated)])],
+  [no],
+  [no])
 
 if test "$PHP_WDDX" != "no"; then
 
diff --git a/ext/xml/config.m4 b/ext/xml/config.m4
index d07b515b77..45d0ab4214 100644
--- a/ext/xml/config.m4
+++ b/ext/xml/config.m4
@@ -1,15 +1,26 @@
 dnl config.m4 for extension xml
 
-PHP_ARG_ENABLE(xml,whether to enable XML support,
-[  --disable-xml           Disable XML support], yes)
+PHP_ARG_ENABLE([xml],
+  [whether to enable XML support],
+  [AS_HELP_STRING([--disable-xml],
+    [Disable XML support])],
+  [yes])
 
 if test -z "$PHP_LIBXML_DIR"; then
-  PHP_ARG_WITH(libxml-dir, libxml2 install dir,
-  [  --with-libxml-dir=DIR   XML: libxml2 install prefix], no, no)
+  PHP_ARG_WITH([libxml-dir],
+    [libxml2 install dir],
+    [AS_HELP_STRING([--with-libxml-dir=DIR],
+      [XML: libxml2 install prefix])],
+    [no],
+    [no])
 fi
 
-PHP_ARG_WITH(libexpat-dir, libexpat install dir,
-[  --with-libexpat-dir=DIR XML: libexpat install prefix (deprecated)], no, no)
+PHP_ARG_WITH([libexpat-dir],
+  [libexpat install dir],
+  [AS_HELP_STRING([--with-libexpat-dir=DIR],
+    [XML: libexpat install prefix (deprecated)])],
+  [no],
+  [no])
 
 if test "$PHP_XML" != "no"; then
 
diff --git a/ext/xmlreader/config.m4 b/ext/xmlreader/config.m4
index d9dacf99ae..5bc768a3b0 100644
--- a/ext/xmlreader/config.m4
+++ b/ext/xmlreader/config.m4
@@ -1,11 +1,18 @@
 dnl config.m4 for extension xmlreader
 
-PHP_ARG_ENABLE(xmlreader, whether to enable XMLReader support,
-[  --disable-xmlreader     Disable XMLReader support], yes)
+PHP_ARG_ENABLE([xmlreader],
+  [whether to enable XMLReader support],
+  [AS_HELP_STRING([--disable-xmlreader],
+    [Disable XMLReader support])],
+  [yes])
 
 if test -z "$PHP_LIBXML_DIR"; then
-  PHP_ARG_WITH(libxml-dir, libxml2 install dir,
-  [  --with-libxml-dir=DIR   XMLReader: libxml2 install prefix], no, no)
+  PHP_ARG_WITH([libxml-dir],
+    [libxml2 install dir],
+    [AS_HELP_STRING([--with-libxml-dir=DIR],
+      [XMLReader: libxml2 install prefix])],
+    [no],
+    [no])
 fi
 
 if test "$PHP_XMLREADER" != "no"; then
diff --git a/ext/xmlrpc/config.m4 b/ext/xmlrpc/config.m4
index 206924204d..cf9a3111e7 100644
--- a/ext/xmlrpc/config.m4
+++ b/ext/xmlrpc/config.m4
@@ -5,19 +5,33 @@ sinclude(ext/xmlrpc/libxmlrpc/xmlrpc.m4)
 sinclude(libxmlrpc/acinclude.m4)
 sinclude(libxmlrpc/xmlrpc.m4)
 
-PHP_ARG_WITH(xmlrpc, for XMLRPC-EPI support,
-[  --with-xmlrpc[=DIR]       Include XMLRPC-EPI support])
+PHP_ARG_WITH([xmlrpc],
+  [for XMLRPC-EPI support],
+  [AS_HELP_STRING([[--with-xmlrpc[=DIR]]],
+    [Include XMLRPC-EPI support])])
 
 if test -z "$PHP_LIBXML_DIR"; then
-  PHP_ARG_WITH(libxml-dir, libxml2 install dir,
-  [  --with-libxml-dir=DIR   XMLRPC-EPI: libxml2 install prefix], no, no)
+  PHP_ARG_WITH([libxml-dir],
+    [libxml2 install dir],
+    [AS_HELP_STRING([--with-libxml-dir=DIR],
+      [XMLRPC-EPI: libxml2 install prefix])],
+    [no],
+    [no])
 fi
 
-PHP_ARG_WITH(libexpat-dir, libexpat dir for XMLRPC-EPI,
-[  --with-libexpat-dir=DIR XMLRPC-EPI: libexpat dir for XMLRPC-EPI (deprecated)],no,no)
-
-PHP_ARG_WITH(iconv-dir, iconv dir for XMLRPC-EPI,
-[  --with-iconv-dir=DIR    XMLRPC-EPI: iconv dir for XMLRPC-EPI],no,no)
+PHP_ARG_WITH([libexpat-dir],
+  [libexpat dir for XMLRPC-EPI],
+  [AS_HELP_STRING([--with-libexpat-dir=DIR],
+    [XMLRPC-EPI: libexpat dir for XMLRPC-EPI (deprecated)])],
+  [no],
+  [no])
+
+PHP_ARG_WITH([iconv-dir],
+  [iconv dir for XMLRPC-EPI],
+  [AS_HELP_STRING([--with-iconv-dir=DIR],
+    [XMLRPC-EPI: iconv dir for XMLRPC-EPI])],
+  [no],
+  [no])
 
 if test "$PHP_XMLRPC" != "no"; then
 
diff --git a/ext/xmlwriter/config.m4 b/ext/xmlwriter/config.m4
index 72ba318dfd..c3381db741 100644
--- a/ext/xmlwriter/config.m4
+++ b/ext/xmlwriter/config.m4
@@ -1,11 +1,18 @@
 dnl config.m4 for extension xmlwriter
 
-PHP_ARG_ENABLE(xmlwriter, whether to enable XMLWriter support,
-[  --disable-xmlwriter     Disable XMLWriter support], yes)
+PHP_ARG_ENABLE([xmlwriter],
+  [whether to enable XMLWriter support],
+  [AS_HELP_STRING([--disable-xmlwriter],
+    [Disable XMLWriter support])],
+  [yes])
 
 if test -z "$PHP_LIBXML_DIR"; then
-  PHP_ARG_WITH(libxml-dir, libxml2 install dir,
-  [  --with-libxml-dir=DIR   XMLWriter: libxml2 install prefix], no, no)
+  PHP_ARG_WITH([libxml-dir],
+    [libxml2 install dir],
+    [AS_HELP_STRING([--with-libxml-dir=DIR],
+      [XMLWriter: libxml2 install prefix])],
+    [no],
+    [no])
 fi
 
 if test "$PHP_XMLWRITER" != "no"; then
diff --git a/ext/xsl/config.m4 b/ext/xsl/config.m4
index ccf6de1839..733ff89d17 100644
--- a/ext/xsl/config.m4
+++ b/ext/xsl/config.m4
@@ -1,8 +1,10 @@
 dnl config.m4 for extension xsl
 
-PHP_ARG_WITH(xsl, for XSL support,
-[  --with-xsl[=DIR]          Include XSL support.  DIR is the libxslt base
-                          install directory (libxslt >= 1.1.0 required)])
+PHP_ARG_WITH([xsl],
+  [for XSL support],
+  [AS_HELP_STRING([[--with-xsl[=DIR]]],
+    [Include XSL support. DIR is the libxslt base install directory (libxslt >=
+    1.1.0 required)])])
 
 if test "$PHP_XSL" != "no"; then
 
diff --git a/ext/zend_test/config.m4 b/ext/zend_test/config.m4
index 242d195eb4..71d05026b9 100644
--- a/ext/zend_test/config.m4
+++ b/ext/zend_test/config.m4
@@ -1,5 +1,7 @@
-PHP_ARG_ENABLE(zend-test, whether to enable zend-test extension,
-[  --enable-zend-test      Enable zend-test extension])
+PHP_ARG_ENABLE([zend-test],
+  [whether to enable zend-test extension],
+  [AS_HELP_STRING([--enable-zend-test],
+    [Enable zend-test extension])])
 
 if test "$PHP_ZEND_TEST" != "no"; then
   PHP_NEW_EXTENSION(zend_test, test.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
diff --git a/ext/zip/config.m4 b/ext/zip/config.m4
index 5c88231f54..41b6ca8341 100644
--- a/ext/zip/config.m4
+++ b/ext/zip/config.m4
@@ -1,10 +1,16 @@
 dnl config.m4 for extension zip
 
-PHP_ARG_ENABLE(zip, for zip archive read/writesupport,
-[  --enable-zip            Include Zip read/write support])
-
-PHP_ARG_WITH(libzip, libzip,
-[  --with-libzip[=DIR]       ZIP: use libzip], yes, no)
+PHP_ARG_ENABLE([zip],
+  [for zip archive read/writesupport],
+  [AS_HELP_STRING([--enable-zip],
+    [Include Zip read/write support])])
+
+PHP_ARG_WITH([libzip],
+  [libzip],
+  [AS_HELP_STRING([[--with-libzip[=DIR]]],
+    [ZIP: use libzip])],
+  [yes],
+  [no])
 
 if test "$PHP_ZIP" != "no"; then
 
diff --git a/ext/zlib/config0.m4 b/ext/zlib/config0.m4
index 1c6b68aa9f..4619e0eda2 100644
--- a/ext/zlib/config0.m4
+++ b/ext/zlib/config0.m4
@@ -1,7 +1,9 @@
 dnl config.m4 for extension zlib
 
-PHP_ARG_WITH(zlib,for ZLIB support,
-[  --with-zlib               Include ZLIB support (requires zlib >= 1.2.0.4)])
+PHP_ARG_WITH([zlib],
+  [for ZLIB support],
+  [AS_HELP_STRING([--with-zlib],
+    [Include ZLIB support (requires zlib >= 1.2.0.4)])])
 
 if test "$PHP_ZLIB" != "no"; then
   PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.0.4])