Normalize comments in *nix build system m4 files

Normalization include:
- Use dnl for everything that can be ommitted when configure is built in
  favor of the shell comment character # which is visible in the output.
- Line length normalized to 80 columns
- Dots for most of the one line sentences
- Macro definitions include similar pattern header comments now

70 files changed, 104 insertions, 240 deletions

diff --git a/ext/bcmath/config.m4 b/ext/bcmath/config.m4
index e6a99a7239..2877a7d4ad 100644
--- a/ext/bcmath/config.m4
+++ b/ext/bcmath/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension bcmath
-
 PHP_ARG_ENABLE([bcmath],
   [whether to enable bc style precision math functions],
   [AS_HELP_STRING([--enable-bcmath],
diff --git a/ext/bz2/config.m4 b/ext/bz2/config.m4
index 65e8fcce23..56d81a60d7 100644
--- a/ext/bz2/config.m4
+++ b/ext/bz2/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension bz2
-
 PHP_ARG_WITH([bz2],
   [for BZip2 support],
   [AS_HELP_STRING([[--with-bz2[=DIR]]],
diff --git a/ext/calendar/config.m4 b/ext/calendar/config.m4
index 7c179760df..bb3cfe4a62 100644
--- a/ext/calendar/config.m4
+++ b/ext/calendar/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension calendar
-
 PHP_ARG_ENABLE([calendar],
   [whether to enable calendar conversion support],
   [AS_HELP_STRING([--enable-calendar],
diff --git a/ext/ctype/config.m4 b/ext/ctype/config.m4
index 726648bfc0..7646525a70 100644
--- a/ext/ctype/config.m4
+++ b/ext/ctype/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension ctype
-
 PHP_ARG_ENABLE([ctype],
   [whether to enable ctype functions],
   [AS_HELP_STRING([--disable-ctype],
diff --git a/ext/curl/config.m4 b/ext/curl/config.m4
index 88447bd78a..cd02577907 100644
--- a/ext/curl/config.m4
+++ b/ext/curl/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension curl
-
 PHP_ARG_WITH([curl],
   [for cURL support],
   [AS_HELP_STRING([--with-curl],
diff --git a/ext/date/config0.m4 b/ext/date/config0.m4
index 6c9d614181..ebd86acc2e 100644
--- a/ext/date/config0.m4
+++ b/ext/date/config0.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for date extension
-
 dnl Check for headers needed by timelib
 AC_CHECK_HEADERS([ \
 strings.h \
diff --git a/ext/dba/config.m4 b/ext/dba/config.m4
index 825cb2dc04..dcf01d0d13 100644
--- a/ext/dba/config.m4
+++ b/ext/dba/config.m4
@@ -1,7 +1,4 @@
-dnl config.m4 for extension dba
-
 dnl Suppose we need FlatFile if no support or only CDB is used.
-
 AC_DEFUN([PHP_DBA_STD_BEGIN],[
   unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX THIS_RESULT
 ])
@@ -136,7 +133,7 @@ dnl
 dnl Library checks
 dnl
 
-# QDBM
+dnl QDBM
 if test "$PHP_QDBM" != "no"; then
   PHP_DBA_STD_BEGIN
   for i in $PHP_QDBM /usr/local /usr; do
@@ -166,7 +163,7 @@ if test "$PHP_QDBM" != "no"; then
 fi
 PHP_DBA_STD_RESULT(qdbm)
 
-# GDBM
+dnl GDBM
 if test "$PHP_GDBM" != "no"; then
   PHP_DBA_STD_BEGIN
   if test "$HAVE_QDBM" = "1"; then
@@ -194,7 +191,7 @@ if test "$PHP_GDBM" != "no"; then
 fi
 PHP_DBA_STD_RESULT(gdbm)
 
-# NDBM
+dnl NDBM
 if test "$PHP_NDBM" != "no"; then
   PHP_DBA_STD_BEGIN
   for i in $PHP_NDBM /usr/local /usr; do
@@ -368,7 +365,7 @@ AC_DEFUN([PHP_DBA_DB_CHECK],[
   PHP_DBA_STD_ATTACH
 ])
 
-# DB4
+dnl DB4
 if test "$PHP_DB4" != "no"; then
   PHP_DBA_STD_BEGIN
   dbdp4="/usr/local/BerkeleyDB.4."
@@ -432,7 +429,7 @@ if test "$PHP_DB4" != "no"; then
 fi
 PHP_DBA_STD_RESULT(db4,Berkeley DB4)
 
-# DB3
+dnl DB3
 if test "$PHP_DB3" != "no"; then
   PHP_DBA_STD_BEGIN
   if test "$HAVE_DB4" = "1"; then
@@ -465,7 +462,7 @@ if test "$PHP_DB3" != "no"; then
 fi
 PHP_DBA_STD_RESULT(db3,Berkeley DB3)
 
-# DB2
+dnl DB2
 if test "$PHP_DB2" != "no"; then
   PHP_DBA_STD_BEGIN
   if test "$HAVE_DB3" = "1" || test "$HAVE_DB4" = "1"; then
@@ -498,7 +495,7 @@ if test "$PHP_DB2" != "no"; then
 fi
 PHP_DBA_STD_RESULT(db2, Berkeley DB2)
 
-# DB1
+dnl DB1
 if test "$PHP_DB1" != "no"; then
   PHP_DBA_STD_BEGIN
   AC_MSG_CHECKING([for DB1 in library])
@@ -565,7 +562,7 @@ if test "$PHP_DB1" != "no"; then
 fi
 PHP_DBA_STD_RESULT(db1, DB1)
 
-# DBM
+dnl DBM
 if test "$PHP_DBM" != "no"; then
   PHP_DBA_STD_BEGIN
   if test "$HAVE_QDBM" = "1"; then
@@ -610,9 +607,8 @@ if test "$PHP_DBM" != "no"; then
 fi
 PHP_DBA_STD_RESULT(dbm)
 
-dnl
-dnl Bundled modules that should be enabled by default if any other option is enabled
-dnl
+dnl Bundled modules that should be enabled by default if any other option is
+dnl enabled
 if test "$PHP_DBA" != "no" || test "$HAVE_DBA" = "1" || test "$with_cdb" = "yes" || test "$enable_inifile" = "yes" || test "$enable_flatfile" = "yes"; then
   php_dba_enable=yes
 else
@@ -637,7 +633,7 @@ PHP_ARG_ENABLE([flatfile],,
   [$php_dba_enable],
   [no])
 
-# CDB
+dnl CDB
 if test "$PHP_CDB" = "yes"; then
   AC_DEFINE(DBA_CDB_BUILTIN, 1, [ ])
   AC_DEFINE(DBA_CDB_MAKE, 1, [ ])
@@ -673,7 +669,7 @@ elif test "$PHP_CDB" != "no"; then
 fi
 PHP_DBA_STD_RESULT(cdb)
 
-# INIFILE
+dnl INIFILE
 if test "$PHP_INIFILE" != "no"; then
   AC_DEFINE(DBA_INIFILE, 1, [ ])
   ini_sources="libinifile/inifile.c"
@@ -681,7 +677,7 @@ if test "$PHP_INIFILE" != "no"; then
 fi
 PHP_DBA_STD_RESULT(inifile, [INI File])
 
-# FLATFILE
+dnl FLATFILE
 if test "$PHP_FLATFILE" != "no"; then
   AC_DEFINE(DBA_FLATFILE, 1, [ ])
   flat_sources="libflatfile/flatfile.c"
diff --git a/ext/dom/config.m4 b/ext/dom/config.m4
index c7ebb20f81..1a7f81ef8d 100644
--- a/ext/dom/config.m4
+++ b/ext/dom/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension dom
-
 PHP_ARG_ENABLE([dom],
   [whether to enable DOM support],
   [AS_HELP_STRING([--disable-dom],
diff --git a/ext/enchant/config.m4 b/ext/enchant/config.m4
index d635281acb..44fee08738 100644
--- a/ext/enchant/config.m4
+++ b/ext/enchant/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension enchant
-
 PHP_ARG_WITH([enchant],
   [for ENCHANT support],
   [AS_HELP_STRING([[--with-enchant[=DIR]]],
diff --git a/ext/exif/config.m4 b/ext/exif/config.m4
index 4943a69713..a2e3250a9d 100644
--- a/ext/exif/config.m4
+++ b/ext/exif/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension exif
-
 PHP_ARG_ENABLE([exif],
   [whether to enable EXIF (metadata from images) support],
   [AS_HELP_STRING([--enable-exif],
diff --git a/ext/ffi/config.m4 b/ext/ffi/config.m4
index d8e2c6902a..b0872a302a 100644
--- a/ext/ffi/config.m4
+++ b/ext/ffi/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension FFI
-
 PHP_ARG_WITH([ffi],
   [for FFI support],
   [AS_HELP_STRING([--with-ffi],
diff --git a/ext/fileinfo/config.m4 b/ext/fileinfo/config.m4
index d3e8a19587..5ecf684d2b 100644
--- a/ext/fileinfo/config.m4
+++ b/ext/fileinfo/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension fileinfo
-
 PHP_ARG_ENABLE([fileinfo],
   [for fileinfo support],
   [AS_HELP_STRING([--disable-fileinfo],
diff --git a/ext/filter/config.m4 b/ext/filter/config.m4
index 06ca873f6f..0108a17fb7 100644
--- a/ext/filter/config.m4
+++ b/ext/filter/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for input filtering extension
-
 PHP_ARG_ENABLE([filter],
   [whether to enable input filter support],
   [AS_HELP_STRING([--disable-filter],
diff --git a/ext/ftp/config.m4 b/ext/ftp/config.m4
index a9b9371741..3d81242a69 100644
--- a/ext/ftp/config.m4
+++ b/ext/ftp/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension ftp
-
 PHP_ARG_ENABLE([ftp],
   [whether to enable FTP support],
   [AS_HELP_STRING([--enable-ftp],
diff --git a/ext/gd/config.m4 b/ext/gd/config.m4
index c1b96fa812..a13313c8e8 100644
--- a/ext/gd/config.m4
+++ b/ext/gd/config.m4
@@ -1,9 +1,6 @@
-dnl config.m4 for extension gd
-
 dnl
 dnl Configure options
 dnl
-
 PHP_ARG_ENABLE([gd],
   [for GD support],
   [AS_HELP_STRING([--enable-gd],
diff --git a/ext/gettext/config.m4 b/ext/gettext/config.m4
index 5f9ee32fa7..536785f0bc 100644
--- a/ext/gettext/config.m4
+++ b/ext/gettext/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension gettext
-
 PHP_ARG_WITH([gettext],
   [for GNU gettext support],
   [AS_HELP_STRING([[--with-gettext[=DIR]]],
diff --git a/ext/hash/config.m4 b/ext/hash/config.m4
index 0158237390..91c5241b00 100644
--- a/ext/hash/config.m4
+++ b/ext/hash/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension hash
-
 PHP_ARG_WITH([mhash],
   [for mhash support],
   [AS_HELP_STRING([[--with-mhash[=DIR]]],
diff --git a/ext/iconv/config.m4 b/ext/iconv/config.m4
index 6cc509eb80..460f3be5b1 100644
--- a/ext/iconv/config.m4
+++ b/ext/iconv/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension iconv
-
 PHP_ARG_WITH([iconv],
   [for iconv support],
   [AS_HELP_STRING([[--without-iconv[=DIR]]],
diff --git a/ext/imap/config.m4 b/ext/imap/config.m4
index 102c917aee..74dbc2d931 100644
--- a/ext/imap/config.m4
+++ b/ext/imap/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension imap
-
 AC_DEFUN([IMAP_INC_CHK],[if test -r "$i$1/c-client.h"; then
     AC_DEFINE(HAVE_IMAP2000, 1, [ ])
     IMAP_DIR=$i
diff --git a/ext/intl/config.m4 b/ext/intl/config.m4
index 668aa3f3d2..7285f75e06 100644
--- a/ext/intl/config.m4
+++ b/ext/intl/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension intl
-
 PHP_ARG_ENABLE([intl],
   [whether to enable internationalization support],
   [AS_HELP_STRING([--enable-intl],
diff --git a/ext/json/config.m4 b/ext/json/config.m4
index b3546046eb..01328d57cc 100644
--- a/ext/json/config.m4
+++ b/ext/json/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension json
-
 PHP_ARG_ENABLE([json],
   [whether to enable JavaScript Object Serialization support],
   [AS_HELP_STRING([--disable-json],
diff --git a/ext/ldap/config.m4 b/ext/ldap/config.m4
index 7653bf9344..1812cb0e0b 100644
--- a/ext/ldap/config.m4
+++ b/ext/ldap/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension ldap
-
 AC_DEFUN([PHP_LDAP_CHECKS], [
   if test -f $1/include/ldap.h; then
     LDAP_DIR=$1
@@ -15,7 +13,8 @@ AC_DEFUN([PHP_LDAP_CHECKS], [
     LDAP_LIBDIR=$1/$PHP_LIBDIR
   else
 
-    dnl Find Oracle Instant Client RPM header location corresponding to the given lib path e.g. for --with-ldap=/usr/lib/oracle/12.1/client64/lib
+    dnl Find Oracle Instant Client RPM header location corresponding to the
+    dnl given lib path e.g. for --with-ldap=/usr/lib/oracle/12.1/client64/lib
     AC_CHECK_SIZEOF([long])
     AC_MSG_CHECKING([if we're at 64-bit platform])
     AS_IF([test "$ac_cv_sizeof_long" -eq 4],[
@@ -114,9 +113,8 @@ if test "$PHP_LDAP" != "no"; then
     AC_MSG_ERROR(Cannot find ldap.h)
   fi
 
-  dnl The Linux version of the SDK need -lpthread
-  dnl I have tested Solaris, and it doesn't, but others may.  Add
-  dnl these here if necessary.   -RL
+  dnl The Linux version of the SDK needs -lpthread. Solaris tested, and it
+  dnl doesn't, but others may. Add these here if necessary. -RL
   dnl Is this really necessary? -Troels Arvin
 
   if test `uname` = "Linux"; then
@@ -212,20 +210,16 @@ if test "$PHP_LDAP" != "no"; then
     AC_DEFINE(HAVE_3ARG_SETREBINDPROC,1,[Whether 3 arg set_rebind_proc()])
   fi
 
-  dnl Solaris 2.8 claims to be 2004 API, but doesn't have
-  dnl ldap_parse_reference() nor ldap_start_tls_s()
+  dnl Solaris 2.8 claims to be 2004 API, but doesn't have ldap_parse_reference()
+  dnl nor ldap_start_tls_s()
   AC_CHECK_FUNCS([ldap_parse_result ldap_parse_reference ldap_start_tls_s ldap_control_find ldap_parse_extended_result ldap_extended_operation ldap_extended_operation_s ldap_passwd ldap_whoami_s ldap_refresh_s])
 
-  dnl
   dnl SASL check
-  dnl
   if test "$PHP_LDAP_SASL" != "no"; then
     PHP_LDAP_SASL_CHECKS([$PHP_LDAP_SASL])
   fi
 
-  dnl
   dnl Sanity check
-  dnl
   AC_CHECK_FUNC(ldap_bind_s, [], [
     AC_MSG_ERROR([LDAP build check failed. Please check config.log for more information.])
   ])
diff --git a/ext/libxml/config0.m4 b/ext/libxml/config0.m4
index 98d5134f36..044a58fa62 100644
--- a/ext/libxml/config0.m4
+++ b/ext/libxml/config0.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension libxml
-
 PHP_ARG_WITH([libxml],
   [whether to build with LIBXML support],
   [AS_HELP_STRING([--without-libxml],
diff --git a/ext/mbstring/config.m4 b/ext/mbstring/config.m4
index 893f75b4cb..e050286fbb 100644
--- a/ext/mbstring/config.m4
+++ b/ext/mbstring/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension mbstring
-
 AC_DEFUN([PHP_MBSTRING_ADD_SOURCES], [
   PHP_MBSTRING_SOURCES="$PHP_MBSTRING_SOURCES $1"
 ])
diff --git a/ext/mysqli/config.m4 b/ext/mysqli/config.m4
index 31f635305a..c78eb2bedc 100644
--- a/ext/mysqli/config.m4
+++ b/ext/mysqli/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension mysqli
-
 dnl ext/pdo_mysql/config.m4 also depends on this macro.
 AC_DEFUN([PHP_MYSQL_SOCKET_SEARCH], [
   for i in  \
diff --git a/ext/mysqlnd/config9.m4 b/ext/mysqlnd/config9.m4
index e0e2da602d..806580798e 100644
--- a/ext/mysqlnd/config9.m4
+++ b/ext/mysqlnd/config9.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for mysqlnd driver
-
 PHP_ARG_ENABLE([mysqlnd],
   [whether to enable mysqlnd],
   [AS_HELP_STRING([--enable-mysqlnd],
diff --git a/ext/oci8/config.m4 b/ext/oci8/config.m4
index d534f09107..89da625e27 100644
--- a/ext/oci8/config.m4
+++ b/ext/oci8/config.m4
@@ -23,7 +23,8 @@ AC_DEFUN([AC_OCI8_CHECK_LIB_DIR],[
   elif test -d "$OCI8_DIR/lib" && test -d "$OCI8_DIR/lib32"; then
     OCI8_LIB_DIR=$PHP_OCI8_OH_LIBDIR
   else
-    dnl This isn't an ORACLE_HOME.  Try heuristic examination of the dir to help the user
+    dnl This isn't an ORACLE_HOME. Try heuristic examination of the dir to help
+    dnl the user.
     if test -f "$OCI8_DIR/libociei.$SHLIB_SUFFIX_NAME"; then
       AC_MSG_ERROR([Expected an ORACLE_HOME top level directory but ${OCI8_DIR} appears to be an Instant Client directory. Try --with-oci8=instantclient,${OCI8_DIR}])
     else
@@ -36,7 +37,8 @@ AC_DEFUN([AC_OCI8_CHECK_LIB_DIR],[
 AC_DEFUN([AC_OCI8IC_VERSION],[
   AC_MSG_CHECKING([Oracle Instant Client library version compatibility])
   OCI8_LCS_BASE=$PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME
-  OCI8_LCS=`ls $OCI8_LCS_BASE.*.1 2> /dev/null | $PHP_OCI8_TAIL1`  # Oracle 10g, 11g etc
+  dnl Oracle 10g, 11g etc
+  OCI8_LCS=`ls $OCI8_LCS_BASE.*.1 2> /dev/null | $PHP_OCI8_TAIL1`
   OCI8_NNZ=`ls $PHP_OCI8_INSTANT_CLIENT/libnnz*.$SHLIB_SUFFIX_NAME 2> /dev/null | $PHP_OCI8_TAIL1`
   if test -f "$OCI8_NNZ" && test -f "$OCI8_LCS"; then
     if test ! -f "$OCI8_LCS_BASE"; then
@@ -52,15 +54,18 @@ AC_DEFUN([AC_OCI8IC_VERSION],[
 AC_DEFUN([AC_OCI8_ORACLE_VERSION],[
   AC_MSG_CHECKING([Oracle library version compatibility])
   OCI8_LCS_BASE=$OCI8_DIR/$OCI8_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME
-  OCI8_LCS=`ls $OCI8_LCS_BASE.*.1 2> /dev/null | $PHP_OCI8_TAIL1`  # Oracle 10g, 11g etc
+  dnl Oracle 10g, 11g etc
+  OCI8_LCS=`ls $OCI8_LCS_BASE.*.1 2> /dev/null | $PHP_OCI8_TAIL1`
   if test -s "$OCI8_DIR/orainst/unix.rgs"; then
     OCI8_ORACLE_VERSION=`grep '"ocommon"' $OCI8_DIR/orainst/unix.rgs | $PHP_OCI8_SED 's/[ ][ ]*/:/g' | cut -d: -f 6 | cut -c 2-4`
     test -z "$OCI8_ORACLE_VERSION" && OCI8_ORACLE_VERSION=7.3
   elif test -f "$OCI8_LCS"; then
-    dnl Oracle 10g, 11g etc.  The x.2 version libraries are named x.1 for drop in compatibility
+    dnl Oracle 10g, 11g etc. The x.2 version libraries are named x.1 for drop in
+    dnl compatibility
     OCI8_ORACLE_VERSION=`echo $OCI8_LCS | $PHP_OCI8_SED -e 's/.*\.\(.*\)\.1$/\1.1/'`
   elif test -f $OCI8_LCS_BASE.9.0; then
-    dnl There is no case for Oracle 9.2. Oracle 9.2 libraries have a 9.0 suffix for drop-in compatibility with Oracle 9.0
+    dnl There is no case for Oracle 9.2. Oracle 9.2 libraries have a 9.0 suffix
+    dnl for drop-in compatibility with Oracle 9.0
     OCI8_ORACLE_VERSION=9.0
   elif test -f $OCI8_LCS_BASE.8.0; then
     OCI8_ORACLE_VERSION=8.1
@@ -80,12 +85,11 @@ AC_DEFUN([AC_OCI8_ORACLE_VERSION],[
 
 dnl
 dnl OCI8_INIT_DTRACE(providerdesc, header-file, sources)
-dnl This mimics PHP_INIT_DTRACE from PHP 5.4's acinclude.m4. It is
-dnl necessarily different from PHP_INIT_DTRACE which doesn't currently
-dnl support DTrace for extensions.  Creating OCI8_INIT_DTRACE
-dnl independently instead of using a refactored PHP_INIT_DTRACE allows
-dnl OCI8 to be DTraced on versions of PHP where core PHP DTrace support
-dnl isn't available.
+dnl This mimics PHP_INIT_DTRACE from build/php.m4. It is necessarily different
+dnl from PHP_INIT_DTRACE which doesn't currently support DTrace for extensions.
+dnl Creating OCI8_INIT_DTRACE independently instead of using a refactored
+dnl PHP_INIT_DTRACE allows OCI8 to be DTraced on versions of PHP where core PHP
+dnl DTrace support isn't available.
 dnl
 AC_DEFUN([OCI8_INIT_DTRACE],[
   ac_srcdir=[]PHP_EXT_SRCDIR([oci8])/
@@ -112,9 +116,9 @@ dnl DTrace objects
     dtrace_oci8_objs="[$]dtrace_oci8_objs `echo $ac_lo | $SED -e 's,\.lo$,.o,' -e 's#\(.*\)\/#\1\/.libs\/#'`"
   done;
 
-dnl Generate Makefile.objects entry
-dnl The empty $ac_provsrc command stops an implicit circular dependency
-dnl in GNU Make which causes the .d file to be overwritten (Bug 61268)
+dnl Generate Makefile.objects entry. The empty $ac_provsrc command stops an
+dnl implicit circular dependency in GNU Make which causes the .d file to be
+dnl overwritten (Bug 61268).
   cat>>Makefile.objects<<EOF
 
 PHP_EXT_SRCDIR([oci8])/$ac_provsrc:;
@@ -135,7 +139,8 @@ EOF
     for ac_lo in $OCI8_DTRACE_OBJS; do
       dtrace_oci8_lib_objs="[$]dtrace_oci8_lib_objs `echo $ac_lo | $SED -e 's,\.lo$,.o,' -e 's#\(.*\)\/#\1\/.libs\/#'`"
     done;
-dnl Always attempt to create both PIC and non-PIC DTrace objects (Bug 63692)
+
+    dnl Always attempt to create both PIC and non-PIC DTrace objects (Bug 63692)
     cat>>Makefile.objects<<EOF
 $ac_bdir[$]ac_provsrc.lo: \$(OCI8_DTRACE_OBJS)
 	echo "[#] Generated by Makefile for libtool" > \$[]@
@@ -164,7 +169,6 @@ EOF
   esac
 ])
 
-
 dnl --with-oci8=shared,instantclient,/path/to/client/dir/lib
 dnl or
 dnl --with-oci8=shared,/path/to/oracle/home
@@ -178,12 +182,12 @@ PHP_ARG_WITH([oci8],
 if test "$PHP_OCI8" != "no"; then
 
   if test -z "$PHP_OCI8"; then
-    dnl --with-oci8=$ORACLE_HOME where ORACLE_HOME isn't set (or is mistyped) will match this case
+    dnl --with-oci8=$ORACLE_HOME where ORACLE_HOME isn't set (or is mistyped)
+    dnl will match this case.
     AC_MSG_ERROR([Empty parameter value passed to --with-oci8])
   fi
 
-  dnl Check PHP version is compatible with this extension
-
+  dnl Check PHP version is compatible with this extension.
   AC_MSG_CHECKING([PHP version])
 
   tmp_version=$PHP_VERSION
@@ -212,9 +216,9 @@ if test "$PHP_OCI8" != "no"; then
     AC_MSG_RESULT([$php_version, ok])
   fi
 
-  dnl Check whether --enable-dtrace was set.
-  dnl To use DTrace with a PECL install, extract the OCI8 archive, phpize it, and set
-  dnl PHP_DTRACE=yes before running configure
+  dnl Check whether --enable-dtrace was set. To use DTrace with a PECL install,
+  dnl extract the OCI8 archive, phpize it, and set PHP_DTRACE=yes before running
+  dnl configure.
   AC_MSG_CHECKING([OCI8 DTrace support])
   oci8_do_dtrace="`echo $PHP_OCI8 | cut -d, -f3`"
   if test "$PHP_DTRACE" = "yes" -o "$oci8_do_dtrace" = "dtrace" ; then
@@ -231,14 +235,15 @@ if test "$PHP_OCI8" != "no"; then
        ])
       PHP_SUBST(OCI8_DTRACE_OBJS)
       AC_DEFINE(HAVE_OCI8_DTRACE,1,[Defined to 1 if PHP OCI8 DTrace support was enabled during configuration])
-      dnl Developer warning: hard coded extension is OK for the known supported environments
+      dnl Developer warning: hard coded extension is OK for the known supported
+      dnl environments.
       shared_objects_oci8="$shared_objects_oci8 PHP_EXT_BUILDDIR(oci8)/oci8_dtrace.d.lo"
     fi
   else
     AC_MSG_RESULT([no])
   fi
 
-  dnl Set some port specific directory components for use later
+  dnl Set some port specific directory components for use later.
   AC_CHECK_SIZEOF([long])
   AC_MSG_CHECKING([if we're at 64-bit platform])
   AS_IF([test "$ac_cv_sizeof_long" -eq 4],[
@@ -251,15 +256,15 @@ if test "$PHP_OCI8" != "no"; then
     PHP_OCI8_IC_LIBDIR_SUFFIX=64
   ])
 
-  dnl Determine if the user wants to use Oracle Instant Client libraries
+  dnl Determine if the user wants to use Oracle Instant Client libraries.
 
   PHP_OCI8_INSTANT_CLIENT="no"
 
-  dnl PECL Bug 14268 (Allow "pecl install oci8" command to "autodetect"
-  dnl an Instant Client RPM install).  This also has a benefit for non
-  dnl "pecl install" builds: if the user does --with-oci8 or
-  dnl --with-oci8=shared but the ORACLE_HOME environment variable is not
-  dnl actually set, the install tries to locate the Instant Client RPM
+  dnl PECL Bug 14268 (Allow "pecl install oci8" command to "autodetect" an
+  dnl Instant Client RPM install).  This also has a benefit for non
+  dnl "pecl install" builds: if the user does --with-oci8 or --with-oci8=shared
+  dnl but the ORACLE_HOME environment variable is not actually set, the install
+  dnl tries to locate the Instant Client RPM.
   if test "$PHP_OCI8" = "yes" && test -z "$ORACLE_HOME"; then
     AC_MSG_WARN([OCI8 extension: ORACLE_HOME is not set, looking for default Oracle Instant Client instead])
     PHP_OCI8=instantclient
@@ -355,11 +360,11 @@ if test "$PHP_OCI8" != "no"; then
     AC_MSG_CHECKING([Oracle Instant Client directory])
 
     if test "$PHP_OCI8_INSTANT_CLIENT" = "yes"; then
-      dnl Find the directory if user specified "instantclient" but did not
-      dnl give a dir. Generally the Instant Client can be anywhere so the
-      dnl user must pass in the library directory.  But on Linux we default
-      dnl to the most recent version in /usr/lib which is where the Oracle
-      dnl Instant Client RPM gets installed.
+      dnl Find the directory if user specified "instantclient" but did not give
+      dnl a dir. Generally the Instant Client can be anywhere so the user must
+      dnl pass in the library directory.  But on Linux we default to the most
+      dnl recent version in /usr/lib which is where the Oracle Instant Client
+      dnl RPM gets installed.
       PHP_OCI8_INSTANT_CLIENT=`ls -d /usr/lib/oracle/*/client${PHP_OCI8_IC_LIBDIR_SUFFIX}/lib/libclntsh.* 2> /dev/null | $PHP_OCI8_TAIL1 | $PHP_OCI8_SED -e 's#/libclntsh[^/]*##'`
       if test -z "$PHP_OCI8_INSTANT_CLIENT"; then
 	AC_MSG_ERROR([Oracle Instant Client directory /usr/lib/oracle/.../client${PHP_OCI8_IC_LIBDIR_SUFFIX}/lib libraries not found. Try --with-oci8=instantclient,DIR])
diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4
index a96d8c0345..792aaef5bb 100644
--- a/ext/odbc/config.m4
+++ b/ext/odbc/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension odbc
-
 AC_DEFUN([PHP_ODBC_CHECK_HEADER],[
 if ! test -f "$ODBC_INCDIR/$1"; then
   AC_MSG_ERROR([ODBC header file '$ODBC_INCDIR/$1' not found!])
@@ -48,14 +46,10 @@ AC_DEFUN([PHP_ODBC_FIND_SOLID_LIBS],[
     ac_solid_prefix=scl
   fi
 
-#
-# Check for the library files, and setup the ODBC_LIBS path...
-#
+dnl Check for the library files, and setup the ODBC_LIBS path.
 if test ! -f $1/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.so -a \
   ! -f $1/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.a; then
-  #
-  # we have an error and should bail out, as we can't find the libs!
-  #
+  dnl we have an error and should bail out, as we can't find the libs!
   echo ""
   echo "*********************************************************************"
   echo "* Unable to locate $1/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.so or $1/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.a"
@@ -393,10 +387,10 @@ PHP_ARG_WITH([dbmaker],,
   AC_MSG_CHECKING(for DBMaker support)
   if test "$PHP_DBMAKER" != "no"; then
     if test "$PHP_DBMAKER" = "yes"; then
-      # find dbmaker's home directory
+      dnl Find dbmaker's home directory
       DBMAKER_HOME=`grep "^dbmaker:" /etc/passwd | $AWK -F: '{print $6}'`
 
-      # check DBMaker version (from 5.0 to 2.0)
+      dnl check DBMaker version (from 5.0 to 2.0)
       DBMAKER_VERSION=5.0
 
       while test ! -d $DBMAKER_HOME/$DBMAKER_VERSION -a "$DBMAKER_VERSION" != "2.9"; do
@@ -445,10 +439,7 @@ else
   AC_DEFINE(ODBCVER, 0x0300, [ The highest supported ODBC version ])
 fi
 
-
-dnl
 dnl Extension setup
-dnl
 if test -n "$ODBC_TYPE"; then
   if test "$ODBC_TYPE" != "dbmaker"; then
     PHP_EVAL_LIBLINE([$ODBC_LFLAGS $ODBC_LIBS], ODBC_SHARED_LIBADD)
diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4
index 149e7c6dee..4d8f3a5888 100644
--- a/ext/opcache/config.m4
+++ b/ext/opcache/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension opcache
-
 PHP_ARG_ENABLE([opcache],
   [whether to enable Zend OPcache support],
   [AS_HELP_STRING([--disable-opcache],
diff --git a/ext/openssl/config0.m4 b/ext/openssl/config0.m4
index b77bd5508b..9df2469363 100644
--- a/ext/openssl/config0.m4
+++ b/ext/openssl/config0.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension openssl
-
 PHP_ARG_WITH([openssl],
   [for OpenSSL support],
   [AS_HELP_STRING([--with-openssl],
diff --git a/ext/pcntl/config.m4 b/ext/pcntl/config.m4
index c9672de0fb..bf7f3064b4 100644
--- a/ext/pcntl/config.m4
+++ b/ext/pcntl/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension pcntl
-
 PHP_ARG_ENABLE([pcntl],
   [whether to enable pcntl support],
   [AS_HELP_STRING([--enable-pcntl],
diff --git a/ext/pcre/config0.m4 b/ext/pcre/config0.m4
index c15f785a4e..a6601fc3f1 100644
--- a/ext/pcre/config0.m4
+++ b/ext/pcre/config0.m4
@@ -1,8 +1,5 @@
-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
-
+dnl By default we'll compile and link against the bundled PCRE library. If
+dnl --with-external-pcre is supplied, we'll use that for linking.
 PHP_ARG_WITH([external-pcre],,
   [AS_HELP_STRING([--with-external-pcre],
     [Use external library for PCRE support])],
diff --git a/ext/pdo/config.m4 b/ext/pdo/config.m4
index ad02f36e3a..b8e6f4e129 100644
--- a/ext/pdo/config.m4
+++ b/ext/pdo/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension pdo
-
 PHP_ARG_ENABLE([pdo],
   [whether to enable PDO support],
   [AS_HELP_STRING([--disable-pdo],
diff --git a/ext/pdo_dblib/config.m4 b/ext/pdo_dblib/config.m4
index 7f6bd50e32..33d80ac28c 100644
--- a/ext/pdo_dblib/config.m4
+++ b/ext/pdo_dblib/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension pdo_dblib
-
 PHP_ARG_WITH([pdo-dblib],
   [for PDO_DBLIB support via FreeTDS],
   [AS_HELP_STRING([[--with-pdo-dblib[=DIR]]],
diff --git a/ext/pdo_mysql/config.m4 b/ext/pdo_mysql/config.m4
index d638f03a28..0bb87c9c25 100644
--- a/ext/pdo_mysql/config.m4
+++ b/ext/pdo_mysql/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension pdo_mysql
-
 PHP_ARG_WITH([pdo-mysql],
   [for MySQL support for PDO],
   [AS_HELP_STRING([[--with-pdo-mysql[=DIR]]],
@@ -16,8 +14,8 @@ if test -z "$PHP_ZLIB_DIR"; then
 fi
 
 if test "$PHP_PDO_MYSQL" != "no"; then
-  dnl This depends on ext/mysqli/config.m4 providing the
-  dnl PHP_MYSQL_SOCKET_SEARCH macro and --with-mysql-sock configure option.
+  dnl This depends on ext/mysqli/config.m4 providing the PHP_MYSQL_SOCKET_SEARCH
+  dnl macro and --with-mysql-sock configure option.
   AC_MSG_CHECKING([for MySQL UNIX socket location])
   if test "$PHP_MYSQL_SOCK" != "no" && test "$PHP_MYSQL_SOCK" != "yes"; then
     MYSQL_SOCK=$PHP_MYSQL_SOCK
diff --git a/ext/pdo_oci/config.m4 b/ext/pdo_oci/config.m4
index c692483394..744a26c788 100644
--- a/ext/pdo_oci/config.m4
+++ b/ext/pdo_oci/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension pdo_oci
-
 if test -z "$SED"; then
   PHP_PDO_OCI_SED="sed";
 else
@@ -16,12 +14,15 @@ fi
 AC_DEFUN([AC_PDO_OCI_VERSION],[
   AC_MSG_CHECKING([Oracle version])
   PDO_OCI_LCS_BASE=$PDO_OCI_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME
-  PDO_OCI_LCS=`ls $PDO_OCI_LCS_BASE.*.1 2> /dev/null | $PHP_PDO_OCI_TAIL1`  # Oracle 10g, 11g, 12c etc
+  dnl Oracle 10g, 11g, 12c etc
+  PDO_OCI_LCS=`ls $PDO_OCI_LCS_BASE.*.1 2> /dev/null | $PHP_PDO_OCI_TAIL1`
   if test -f "$PDO_OCI_LCS"; then
-    dnl Oracle 10g, 11g 12c etc.  The x.2 version libraries are named x.1 for drop in compatibility
+    dnl Oracle 10g, 11g 12c etc. The x.2 version libraries are named x.1 for
+    dnl drop in compatibility
     PDO_OCI_VERSION=`echo $PDO_OCI_LCS | $PHP_PDO_OCI_SED -e 's/.*\.\(.*\)\.1$/\1.1/'`
   elif test -f $PDO_OCI_LCS_BASE.9.0; then
-    dnl There is no case for Oracle 9.2. Oracle 9.2 libraries have a 9.0 suffix for drop-in compatibility with Oracle 9.0
+    dnl There is no case for Oracle 9.2. Oracle 9.2 libraries have a 9.0 suffix
+    dnl for drop-in compatibility with Oracle 9.0
     PDO_OCI_VERSION=9.0
   else
     AC_MSG_ERROR(Oracle libclntsh.$SHLIB_SUFFIX_NAME client library not found or its version is lower than 9)
diff --git a/ext/pdo_odbc/config.m4 b/ext/pdo_odbc/config.m4
index 7c1c469525..9e54591c48 100644
--- a/ext/pdo_odbc/config.m4
+++ b/ext/pdo_odbc/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension pdo_odbc
-
 define([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
@@ -141,8 +139,8 @@ if test "$PHP_PDO_ODBC" != "no"; then
   dnl Check first for an ODBC 1.0 function to assert that the libraries work
   PHP_CHECK_LIBRARY($pdo_odbc_def_lib, SQLBindCol,
   [
-    dnl And now check for an ODBC 3.0 function to assert that they're
-    dnl *good* libraries.
+    dnl And now check for an ODBC 3.0 function to assert that they're *good*
+    dnl libraries.
     PHP_CHECK_LIBRARY($pdo_odbc_def_lib, SQLAllocHandle,
     [], [
       AC_MSG_ERROR([
diff --git a/ext/pdo_pgsql/config.m4 b/ext/pdo_pgsql/config.m4
index a2ab91306a..44a95880a6 100644
--- a/ext/pdo_pgsql/config.m4
+++ b/ext/pdo_pgsql/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension pdo_pgsql
-
 PHP_ARG_WITH([pdo-pgsql],
   [for PostgreSQL support for PDO],
   [AS_HELP_STRING([[--with-pdo-pgsql[=DIR]]],
diff --git a/ext/pdo_sqlite/config.m4 b/ext/pdo_sqlite/config.m4
index c426eaf137..ad955947cf 100644
--- a/ext/pdo_sqlite/config.m4
+++ b/ext/pdo_sqlite/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension pdo_sqlite
-
 PHP_ARG_WITH([pdo-sqlite],
   [for sqlite 3 support for PDO],
   [AS_HELP_STRING([[--without-pdo-sqlite[=DIR]]],
@@ -32,11 +30,15 @@ if test "$PHP_PDO_SQLITE" != "no"; then
 
   php_pdo_sqlite_sources_core="pdo_sqlite.c sqlite_driver.c sqlite_statement.c"
 
-  SEARCH_PATH="$PHP_PDO_SQLITE /usr/local /usr"     # you might want to change this
-  SEARCH_FOR="/include/sqlite3.h"  # you most likely want to change this
-  if test -r $PHP_PDO_SQLITE/$SEARCH_FOR; then # path given as parameter
+  dnl you might want to change this
+  SEARCH_PATH="$PHP_PDO_SQLITE /usr/local /usr"
+  dnl you most likely want to change this
+  SEARCH_FOR="/include/sqlite3.h"
+  if test -r $PHP_PDO_SQLITE/$SEARCH_FOR; then
+    dnl path given as parameter
     PDO_SQLITE_DIR=$PHP_PDO_SQLITE
-  else # search default path list
+  else
+    dnl search default path list
     AC_MSG_CHECKING([for sqlite3 files in default path])
     for i in $SEARCH_PATH ; do
       if test -r $i/$SEARCH_FOR; then
diff --git a/ext/pgsql/config.m4 b/ext/pgsql/config.m4
index e1103f4f89..a5afd02923 100644
--- a/ext/pgsql/config.m4
+++ b/ext/pgsql/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension pgsql
-
 PHP_ARG_WITH([pgsql],
   [for PostgreSQL support],
   [AS_HELP_STRING([[--with-pgsql[=DIR]]],
diff --git a/ext/phar/config.m4 b/ext/phar/config.m4
index eb23bbf794..23e7f58c62 100644
--- a/ext/phar/config.m4
+++ b/ext/phar/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension phar
-
 PHP_ARG_ENABLE([phar],
   [for phar archive support],
   [AS_HELP_STRING([--disable-phar],
diff --git a/ext/posix/config.m4 b/ext/posix/config.m4
index ea67485597..9beea518be 100644
--- a/ext/posix/config.m4
+++ b/ext/posix/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension posix
-
 PHP_ARG_ENABLE([posix],
   [whether to enable POSIX-like functions],
   [AS_HELP_STRING([--disable-posix],
diff --git a/ext/pspell/config.m4 b/ext/pspell/config.m4
index 59ec3a9e7f..a0212165f6 100644
--- a/ext/pspell/config.m4
+++ b/ext/pspell/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension pspell
-
 PHP_ARG_WITH([pspell],
   [for PSPELL support],
   [AS_HELP_STRING([[--with-pspell[=DIR]]],
diff --git a/ext/readline/config.m4 b/ext/readline/config.m4
index 7001a15372..ed205764f2 100644
--- a/ext/readline/config.m4
+++ b/ext/readline/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension readline
-
 PHP_ARG_WITH([libedit],
   [for libedit readline replacement],
   [AS_HELP_STRING([--with-libedit],
@@ -11,7 +9,8 @@ if test "$PHP_LIBEDIT" = "no"; then
     [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
+  dnl "register" the --with-readline option to prevent invalid "unknown
+  dnl configure option" warning
   php_with_readline=no
 fi
 
diff --git a/ext/recode/config.m4 b/ext/recode/config.m4
index 537da2ead2..853b24caaa 100644
--- a/ext/recode/config.m4
+++ b/ext/recode/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension recode
-
 PHP_ARG_WITH([recode],
   [for recode support],
   [AS_HELP_STRING([[--with-recode[=DIR]]],
diff --git a/ext/recode/config9.m4 b/ext/recode/config9.m4
index 5f85655598..28d852d8b0 100644
--- a/ext/recode/config9.m4
+++ b/ext/recode/config9.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension recode
-
 dnl Check for extensions with which Recode can not work
 if test "$PHP_RECODE" != "no"; then
   test "$PHP_IMAP"  != "no" && recode_conflict="$recode_conflict imap"
diff --git a/ext/reflection/config.m4 b/ext/reflection/config.m4
index 96535b7a07..2f295de915 100644
--- a/ext/reflection/config.m4
+++ b/ext/reflection/config.m4
@@ -1,3 +1 @@
-dnl config.m4 for extension reflection
-
 PHP_NEW_EXTENSION(reflection, php_reflection.c, no,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
diff --git a/ext/session/config.m4 b/ext/session/config.m4
index dfb0372529..198c94c739 100644
--- a/ext/session/config.m4
+++ b/ext/session/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension session
-
 PHP_ARG_ENABLE([session],
   [whether to enable PHP sessions],
   [AS_HELP_STRING([--disable-session],
diff --git a/ext/shmop/config.m4 b/ext/shmop/config.m4
index 35c58b906e..c5b1f84142 100644
--- a/ext/shmop/config.m4
+++ b/ext/shmop/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension shmop
-
 PHP_ARG_ENABLE([shmop],
   [whether to enable shmop support],
   [AS_HELP_STRING([--enable-shmop],
diff --git a/ext/simplexml/config.m4 b/ext/simplexml/config.m4
index e591cb90dc..1acd1898c1 100644
--- a/ext/simplexml/config.m4
+++ b/ext/simplexml/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension simplexml
-
 PHP_ARG_ENABLE([simplexml],
   [whether to enable SimpleXML support],
   [AS_HELP_STRING([--disable-simplexml],
diff --git a/ext/skeleton/config.m4.in b/ext/skeleton/config.m4.in
index 663040a368..268a48ba2f 100644
--- a/ext/skeleton/config.m4.in
+++ b/ext/skeleton/config.m4.in
@@ -33,7 +33,7 @@ if test "$PHP_%EXTNAMECAPS%" != "no"; then
   dnl PKG_CHECK_MODULES([LIBFOO], [foo = 1.2.3])
 
   dnl Remove this code block if the library supports pkg-config.
-  dnl # --with-%EXTNAME% -> check with-path
+  dnl --with-%EXTNAME% -> check with-path
   dnl SEARCH_PATH="/usr/local /usr"     # you might want to change this
   dnl SEARCH_FOR="/include/%EXTNAME%.h"  # you most likely want to change this
   dnl if test -r $PHP_%EXTNAMECAPS%/$SEARCH_FOR; then # path given as parameter
@@ -54,11 +54,11 @@ if test "$PHP_%EXTNAMECAPS%" != "no"; then
   dnl fi
 
   dnl Remove this code block if the library supports pkg-config.
-  dnl # --with-%EXTNAME% -> add include path
+  dnl --with-%EXTNAME% -> add include path
   dnl PHP_ADD_INCLUDE($%EXTNAMECAPS%_DIR/include)
 
   dnl Remove this code block if the library supports pkg-config.
-  dnl # --with-%EXTNAME% -> check for lib and symbol presence
+  dnl --with-%EXTNAME% -> check for lib and symbol presence
   dnl LIBNAME=%EXTNAMECAPS% # you may want to change this
   dnl LIBSYMBOL=%EXTNAMECAPS% # you most likely want to change this
 
@@ -87,7 +87,7 @@ if test "$PHP_%EXTNAMECAPS%" != "no"; then
   dnl
   dnl PHP_SUBST(%EXTNAMECAPS%_SHARED_LIBADD)
 
-  dnl # In case of no dependencies
+  dnl In case of no dependencies
   AC_DEFINE(HAVE_%EXTNAMECAPS%, 1, [ Have %EXTNAME% support ])
 
   PHP_NEW_EXTENSION(%EXTNAME%, %EXTNAME%.c, $ext_shared)
diff --git a/ext/snmp/config.m4 b/ext/snmp/config.m4
index 4715259689..893edc79db 100644
--- a/ext/snmp/config.m4
+++ b/ext/snmp/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension snmp
-
 PHP_ARG_WITH([snmp],
   [for SNMP support],
   [AS_HELP_STRING([[--with-snmp[=DIR]]],
diff --git a/ext/soap/config.m4 b/ext/soap/config.m4
index 833af7b7ac..8e5fdd4ebc 100644
--- a/ext/soap/config.m4
+++ b/ext/soap/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension soap
-
 PHP_ARG_ENABLE([soap],
   [whether to enable SOAP support],
   [AS_HELP_STRING([--enable-soap],
diff --git a/ext/sockets/config.m4 b/ext/sockets/config.m4
index f5642fc2c8..405b68d288 100644
--- a/ext/sockets/config.m4
+++ b/ext/sockets/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension sockets
-
 PHP_ARG_ENABLE([sockets],
   [whether to enable sockets support],
   [AS_HELP_STRING([--enable-sockets],
diff --git a/ext/sodium/config.m4 b/ext/sodium/config.m4
index b95529c201..24d6580da8 100644
--- a/ext/sodium/config.m4
+++ b/ext/sodium/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension sodium
-
 PHP_ARG_WITH([sodium],
   [for sodium support],
   [AS_HELP_STRING([--with-sodium],
diff --git a/ext/spl/config.m4 b/ext/spl/config.m4
index 08ecbdf5f6..8e0d31f3e2 100644
--- a/ext/spl/config.m4
+++ b/ext/spl/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension SPL
-
-  PHP_NEW_EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c, no,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
-  PHP_INSTALL_HEADERS([ext/spl], [php_spl.h spl_array.h spl_directory.h spl_engine.h spl_exceptions.h spl_functions.h spl_iterators.h spl_observer.h spl_dllist.h spl_heap.h spl_fixedarray.h])
-  PHP_ADD_EXTENSION_DEP(spl, pcre, true)
+PHP_NEW_EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c, no,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
+PHP_INSTALL_HEADERS([ext/spl], [php_spl.h spl_array.h spl_directory.h spl_engine.h spl_exceptions.h spl_functions.h spl_iterators.h spl_observer.h spl_dllist.h spl_heap.h spl_fixedarray.h])
+PHP_ADD_EXTENSION_DEP(spl, pcre, true)
diff --git a/ext/sqlite3/config0.m4 b/ext/sqlite3/config0.m4
index d6aaf13095..57f8884bfb 100644
--- a/ext/sqlite3/config0.m4
+++ b/ext/sqlite3/config0.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension sqlite3
-
 PHP_ARG_WITH([sqlite3],
   [whether to enable the SQLite3 extension],
   [AS_HELP_STRING([[--without-sqlite3[=DIR]]],
diff --git a/ext/standard/config.m4 b/ext/standard/config.m4
index a017cf4282..891fca2ffa 100644
--- a/ext/standard/config.m4
+++ b/ext/standard/config.m4
@@ -284,14 +284,14 @@ fi
 dnl
 dnl Check for available functions
 dnl
-dnl log2 could be used to improve the log function, however it requires C99. The check for log2 should be turned on,
-dnl as soon as we support C99.
+dnl log2 could be used to improve the log function, however it requires C99. The
+dnl check for log2 should be turned on, as soon as we support C99.
 AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass mempcpy strpncpy)
 AC_FUNC_FNMATCH
 
 dnl
-dnl Check if there is a support means of creating a new process
-dnl and defining which handles it receives
+dnl Check if there is a support means of creating a new process and defining
+dnl which handles it receives
 dnl
 AC_CHECK_FUNCS(fork CreateProcess, [
   php_can_support_proc_open=yes
@@ -335,7 +335,8 @@ fi
 
 dnl
 dnl Detect library functions needed by php dns_xxx functions
-dnl ext/standard/php_dns.h will collect these in a single define: HAVE_FULL_DNS_FUNCS
+dnl ext/standard/php_dns.h will collect these in a single define
+dnl HAVE_FULL_DNS_FUNCS
 dnl
 PHP_CHECK_FUNC(res_nsearch, resolv, bind, socket)
 PHP_CHECK_FUNC(res_ndestroy, resolv, bind, socket)
diff --git a/ext/sysvmsg/config.m4 b/ext/sysvmsg/config.m4
index 3731fe9940..7ad70186fa 100644
--- a/ext/sysvmsg/config.m4
+++ b/ext/sysvmsg/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension sysvmsg
-
 PHP_ARG_ENABLE([sysvmsg],
   [whether to enable System V IPC support],
   [AS_HELP_STRING([--enable-sysvmsg],
diff --git a/ext/sysvsem/config.m4 b/ext/sysvsem/config.m4
index a091cb2a7f..5cbc06ce9c 100644
--- a/ext/sysvsem/config.m4
+++ b/ext/sysvsem/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension sysvsem
-
 PHP_ARG_ENABLE([sysvsem],
   [whether to enable System V semaphore support],
   [AS_HELP_STRING([--enable-sysvsem],
diff --git a/ext/sysvshm/config.m4 b/ext/sysvshm/config.m4
index 7426c6bab6..bd6e40cca9 100644
--- a/ext/sysvshm/config.m4
+++ b/ext/sysvshm/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension sysvshm
-
 PHP_ARG_ENABLE([sysvshm],
   [whether to enable System V shared memory support],
   [AS_HELP_STRING([--enable-sysvshm],
diff --git a/ext/tidy/config.m4 b/ext/tidy/config.m4
index 31103c5c8b..dab58787d4 100644
--- a/ext/tidy/config.m4
+++ b/ext/tidy/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension tidy
-
 PHP_ARG_WITH([tidy],
   [for TIDY support],
   [AS_HELP_STRING([[--with-tidy[=DIR]]],
@@ -32,10 +30,9 @@ if test "$PHP_TIDY" != "no"; then
   if test -z "$TIDY_DIR"; then
     AC_MSG_ERROR(Cannot find libtidy)
   else
-    dnl Check for tidybuffio.h (as opposed to simply buffio.h)
-    dnl which indicates that we are building against tidy-html5
-    dnl and not the legacy htmltidy. The two are compatible,
-    dnl except for with regard to this header file.
+    dnl Check for tidybuffio.h (as opposed to simply buffio.h) which indicates
+    dnl that we are building against tidy-html5 and not the legacy htmltidy. The
+    dnl two are compatible, except for with regard to this header file.
     if test -f "$TIDY_INCDIR/tidybuffio.h"; then
       AC_DEFINE(HAVE_TIDYBUFFIO_H,1,[defined if tidybuffio.h exists])
     fi
diff --git a/ext/tokenizer/config.m4 b/ext/tokenizer/config.m4
index f0781af08e..e607fe50fc 100644
--- a/ext/tokenizer/config.m4
+++ b/ext/tokenizer/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension tokenizer
-
 PHP_ARG_ENABLE([tokenizer],
   [whether to enable tokenizer support],
   [AS_HELP_STRING([--disable-tokenizer],
diff --git a/ext/xml/config.m4 b/ext/xml/config.m4
index ce18d37f8e..24cf7fe2a3 100644
--- a/ext/xml/config.m4
+++ b/ext/xml/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension xml
-
 PHP_ARG_ENABLE([xml],
   [whether to enable XML support],
   [AS_HELP_STRING([--disable-xml],
diff --git a/ext/xmlreader/config.m4 b/ext/xmlreader/config.m4
index 616bd9bb84..8777d93ba9 100644
--- a/ext/xmlreader/config.m4
+++ b/ext/xmlreader/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension xmlreader
-
 PHP_ARG_ENABLE([xmlreader],
   [whether to enable XMLReader support],
   [AS_HELP_STRING([--disable-xmlreader],
diff --git a/ext/xmlrpc/config.m4 b/ext/xmlrpc/config.m4
index 5263557f3d..3ea2d6bd06 100644
--- a/ext/xmlrpc/config.m4
+++ b/ext/xmlrpc/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension xmlrpc
-
 PHP_ARG_WITH([xmlrpc],
   [for XMLRPC-EPI support],
   [AS_HELP_STRING([[--with-xmlrpc[=DIR]]],
@@ -91,9 +89,9 @@ elif test "$PHP_XMLRPC" != "no"; then
   if test -r $PHP_XMLRPC/include/xmlrpc.h; then
     XMLRPC_DIR=$PHP_XMLRPC/include
   elif test -r $PHP_XMLRPC/include/xmlrpc-epi/xmlrpc.h; then
-dnl some xmlrpc-epi header files have generic file names like
-dnl queue.h or base64.h. Distributions have to create dir
-dnl for xmlrpc-epi because of this.
+    dnl Some xmlrpc-epi header files have generic file names like queue.h or
+    dnl base64.h. Distributions have to create dir for xmlrpc-epi because of
+    dnl this.
     XMLRPC_DIR=$PHP_XMLRPC/include/xmlrpc-epi
   else
     AC_MSG_CHECKING(for XMLRPC-EPI in default path)
diff --git a/ext/xmlwriter/config.m4 b/ext/xmlwriter/config.m4
index 54204f1280..a3bce3c652 100644
--- a/ext/xmlwriter/config.m4
+++ b/ext/xmlwriter/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension xmlwriter
-
 PHP_ARG_ENABLE([xmlwriter],
   [whether to enable XMLWriter support],
   [AS_HELP_STRING([--disable-xmlwriter],
diff --git a/ext/xsl/config.m4 b/ext/xsl/config.m4
index 5109d62895..26f6e10e6e 100644
--- a/ext/xsl/config.m4
+++ b/ext/xsl/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension xsl
-
 PHP_ARG_WITH([xsl],
   [for XSL support],
   [AS_HELP_STRING([[--with-xsl[=DIR]]],
diff --git a/ext/zip/config.m4 b/ext/zip/config.m4
index 4f6360243a..0889d3693d 100644
--- a/ext/zip/config.m4
+++ b/ext/zip/config.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension zip
-
 PHP_ARG_WITH([zip],
   [for zip archive read/write support],
   [AS_HELP_STRING([--with-zip],
diff --git a/ext/zlib/config0.m4 b/ext/zlib/config0.m4
index 4619e0eda2..0d60700565 100644
--- a/ext/zlib/config0.m4
+++ b/ext/zlib/config0.m4
@@ -1,5 +1,3 @@
-dnl config.m4 for extension zlib
-
 PHP_ARG_WITH([zlib],
   [for ZLIB support],
   [AS_HELP_STRING([--with-zlib],