Trim trailing whitespaces in build files

Some editors utilizing .editorconfig automatically trim whitespaces. For
convenience this patch removes whitespaces in certain build files:
- ext/*/config*.m4
- configure.ac
- acinclude.m4

33 files changed, 109 insertions, 109 deletions

diff --git a/ext/bz2/config.m4 b/ext/bz2/config.m4
index 1f3d52a7a0..9ba4a24c2b 100644
--- a/ext/bz2/config.m4
+++ b/ext/bz2/config.m4
@@ -22,7 +22,7 @@ if test "$PHP_BZ2" != "no"; then
     AC_MSG_ERROR(Please reinstall the BZip2 distribution)
   fi
 
-  PHP_CHECK_LIBRARY(bz2, BZ2_bzerror, 
+  PHP_CHECK_LIBRARY(bz2, BZ2_bzerror,
   [
     PHP_ADD_INCLUDE($BZIP_DIR/include)
     PHP_ADD_LIBRARY_WITH_PATH(bz2, $BZIP_DIR/$PHP_LIBDIR, BZ2_SHARED_LIBADD)
diff --git a/ext/curl/config.m4 b/ext/curl/config.m4
index da45379ae8..a4b0d0685a 100644
--- a/ext/curl/config.m4
+++ b/ext/curl/config.m4
@@ -89,17 +89,17 @@ if test "$PHP_CURL" != "no"; then
 
   PHP_EVAL_LIBLINE($CURL_LIBS, CURL_SHARED_LIBADD)
   PHP_EVAL_INCLINE($CURL_INCL, CURL_SHARED_LIBADD)
-  
+
   AC_MSG_CHECKING([for SSL support in libcurl])
   if test -n "$CURL_SSL"; then
     AC_MSG_RESULT([yes])
     AC_DEFINE([HAVE_CURL_SSL], [1], [Have cURL with  SSL support])
-   
+
     save_CFLAGS="$CFLAGS"
     CFLAGS=$CURL_INCL
     save_LDFLAGS="$LDFLAGS"
     LDFLAGS=$CURL_LIBS
-   
+
     AC_PROG_CPP
     AC_MSG_CHECKING([for openssl support in libcurl])
     AC_TRY_RUN([
@@ -128,7 +128,7 @@ int main(int argc, char *argv[])
     ], [
       AC_MSG_RESULT([no])
     ])
-   
+
     AC_MSG_CHECKING([for gnutls support in libcurl])
     AC_TRY_RUN([
 #include <strings.h>
@@ -137,7 +137,7 @@ int main(int argc, char *argv[])
 int main(int argc, char *argv[])
 {
   curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
-  
+
   if (data && data->ssl_version && *data->ssl_version) {
     const char *ptr = data->ssl_version;
 
@@ -156,15 +156,15 @@ int main(int argc, char *argv[])
     ], [
       AC_MSG_RESULT([no])
     ])
-   
+
     CFLAGS="$save_CFLAGS"
     LDFLAGS="$save_LDFLAGS"
   else
     AC_MSG_RESULT([no])
   fi
 
-  PHP_CHECK_LIBRARY(curl,curl_easy_perform, 
-  [ 
+  PHP_CHECK_LIBRARY(curl,curl_easy_perform,
+  [
     AC_DEFINE(HAVE_CURL,1,[ ])
   ],[
     AC_MSG_ERROR(There is something wrong. Please check config.log for more information.)
diff --git a/ext/date/config0.m4 b/ext/date/config0.m4
index a543fdc4e6..dfaa9bb343 100644
--- a/ext/date/config0.m4
+++ b/ext/date/config0.m4
@@ -4,7 +4,7 @@ sinclude(ext/date/lib/timelib.m4)
 sinclude(lib/timelib.m4)
 
 PHP_DATE_CFLAGS="-I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1"
-timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c 
+timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c
                  lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c lib/parse_iso_intervals.c lib/interval.c"
 
 PHP_NEW_EXTENSION(date, php_date.c $timelib_sources, no,, $PHP_DATE_CFLAGS)
diff --git a/ext/dba/config.m4 b/ext/dba/config.m4
index b7d97563fe..cf1ab7d6dc 100644
--- a/ext/dba/config.m4
+++ b/ext/dba/config.m4
@@ -153,11 +153,11 @@ if test "$PHP_GDBM" != "no"; then
   if test -n "$THIS_INCLUDE"; then
     PHP_CHECK_LIBRARY(gdbm, gdbm_open, [
       AC_DEFINE_UNQUOTED(GDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
-      AC_DEFINE(DBA_GDBM, 1, [ ]) 
+      AC_DEFINE(DBA_GDBM, 1, [ ])
       THIS_LIBS=gdbm
     ], [], [-L$THIS_PREFIX/$PHP_LIBDIR])
   fi
-    
+
   PHP_DBA_STD_ASSIGN
   PHP_DBA_STD_CHECK
   PHP_DBA_STD_ATTACH
@@ -178,12 +178,12 @@ if test "$PHP_NDBM" != "no"; then
       break
     fi
   done
-  
+
   if test -n "$THIS_INCLUDE"; then
     for LIB in ndbm db1 c; do
       PHP_CHECK_LIBRARY($LIB, dbm_open, [
         AC_DEFINE_UNQUOTED(NDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
-        AC_DEFINE(DBA_NDBM, 1, [ ]) 
+        AC_DEFINE(DBA_NDBM, 1, [ ])
         THIS_LIBS=$LIB
       ], [], [-L$THIS_PREFIX/$PHP_LIBDIR])
       if test -n "$THIS_LIBS"; then
@@ -323,7 +323,7 @@ AC_DEFUN([PHP_DBA_DB_CHECK],[
     ])
   fi
   if test -n "$THIS_LIBS"; then
-    AC_DEFINE(DBA_DB$1, 1, [ ]) 
+    AC_DEFINE(DBA_DB$1, 1, [ ])
     if test -n "$THIS_INCLUDE"; then
       AC_DEFINE_UNQUOTED(DB$1_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
     fi
@@ -565,7 +565,7 @@ if test "$PHP_DBM" != "no"; then
           AC_DEFINE_UNQUOTED(DBM_VERSION, "DBM", [ ])
           AC_MSG_RESULT(no)
         fi
-        AC_DEFINE(DBA_DBM, 1, [ ]) 
+        AC_DEFINE(DBA_DBM, 1, [ ])
         THIS_LIBS=$LIB
       ], [], [-L$THIS_PREFIX/$PHP_LIBDIR])
       if test -n "$THIS_LIBS"; then
@@ -573,7 +573,7 @@ if test "$PHP_DBM" != "no"; then
       fi
     done
   fi
-  
+
   PHP_DBA_STD_ASSIGN
   PHP_DBA_STD_CHECK
   PHP_DBA_STD_ATTACH
@@ -619,7 +619,7 @@ elif test "$PHP_CDB" != "no"; then
     for LIB in cdb c; do
       PHP_CHECK_LIBRARY($LIB, cdb_read, [
         AC_DEFINE_UNQUOTED(CDB_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
-        AC_DEFINE(DBA_CDB, 1, [ ]) 
+        AC_DEFINE(DBA_CDB, 1, [ ])
         THIS_LIBS=$LIB
       ], [], [-L$THIS_PREFIX/$PHP_LIBDIR])
       if test -n "$THIS_LIBS"; then
@@ -652,7 +652,7 @@ PHP_DBA_STD_RESULT(FlatFile, FlatFile)
 
 dnl
 dnl Extension setup
-dnl 
+dnl
 AC_MSG_CHECKING([whether to enable DBA interface])
 if test "$HAVE_DBA" = "1"; then
   if test "$ext_shared" = "yes"; then
diff --git a/ext/dom/config.m4 b/ext/dom/config.m4
index 3e28cb3570..5d96e7bc0f 100644
--- a/ext/dom/config.m4
+++ b/ext/dom/config.m4
@@ -10,7 +10,7 @@ fi
 
 if test "$PHP_DOM" != "no"; then
 
-  if test "$PHP_LIBXML" = "no"; then   
+  if test "$PHP_LIBXML" = "no"; then
     AC_MSG_ERROR([DOM extension requires LIBXML extension, add --enable-libxml])
   fi
 
@@ -25,7 +25,7 @@ if test "$PHP_DOM" != "no"; then
                             nodelist.c text.c comment.c domconfiguration.c \
                             domimplementationsource.c entityreference.c \
                             notation.c xpath.c dom_iterators.c \
-                            typeinfo.c domerror.c domlocator.c namednodemap.c userdatahandler.c], 
+                            typeinfo.c domerror.c domlocator.c namednodemap.c userdatahandler.c],
                             $ext_shared)
     PHP_SUBST(DOM_SHARED_LIBADD)
     PHP_INSTALL_HEADERS([ext/dom/xml_common.h])
diff --git a/ext/gd/config.m4 b/ext/gd/config.m4
index f11a7b9a70..498d870785 100644
--- a/ext/gd/config.m4
+++ b/ext/gd/config.m4
@@ -345,7 +345,7 @@ dnl
 if test "$PHP_GD" != "no"; then
   PHP_NEW_EXTENSION(gd, gd.c $extra_sources, $ext_shared,, \\$(GDLIB_CFLAGS))
 
-  if test "$GD_MODULE_TYPE" = "builtin"; then 
+  if test "$GD_MODULE_TYPE" = "builtin"; then
     PHP_ADD_BUILD_DIR($ext_builddir/libgd)
     GDLIB_CFLAGS="-I$ext_srcdir/libgd $GDLIB_CFLAGS"
     GD_HEADER_DIRS="ext/gd/ ext/gd/libgd/"
diff --git a/ext/gettext/config.m4 b/ext/gettext/config.m4
index 8827bc669f..b1b53601aa 100644
--- a/ext/gettext/config.m4
+++ b/ext/gettext/config.m4
@@ -14,7 +14,7 @@ if test "$PHP_GETTEXT" != "no"; then
 
   GETTEXT_LIBDIR=$GETTEXT_DIR/$PHP_LIBDIR
   GETTEXT_INCDIR=$GETTEXT_DIR/include
-  
+
   O_LDFLAGS=$LDFLAGS
   LDFLAGS="$LDFLAGS -L$GETTEXT_LIBDIR"
   AC_CHECK_LIB(intl, bindtextdomain, [
@@ -44,5 +44,5 @@ if test "$PHP_GETTEXT" != "no"; then
   AC_CHECK_LIB($GETTEXT_CHECK_IN_LIB, dcngettext,  [AC_DEFINE(HAVE_DCNGETTEXT, 1, [ ])])
   AC_CHECK_LIB($GETTEXT_CHECK_IN_LIB, bind_textdomain_codeset,  [AC_DEFINE(HAVE_BIND_TEXTDOMAIN_CODESET, 1, [ ])])
   LDFLAGS=$O_LDFLAGS
-  
+
 fi
diff --git a/ext/gmp/config.m4 b/ext/gmp/config.m4
index a1c565bf4e..75ddf3f37f 100644
--- a/ext/gmp/config.m4
+++ b/ext/gmp/config.m4
@@ -13,7 +13,7 @@ if test "$PHP_GMP" != "no"; then
   if test -z "$GMP_DIR"; then
     AC_MSG_ERROR(Unable to locate gmp.h)
   fi
- 
+
   PHP_CHECK_LIBRARY(gmp, __gmpz_rootrem,
   [],[
     AC_MSG_ERROR([GNU MP Library version 4.2 or greater required.])
diff --git a/ext/imap/config.m4 b/ext/imap/config.m4
index 4cc9d91db9..f6a601776d 100644
--- a/ext/imap/config.m4
+++ b/ext/imap/config.m4
@@ -5,10 +5,10 @@ AC_DEFUN([IMAP_INC_CHK],[if test -r "$i$1/c-client.h"; then
     IMAP_DIR=$i
     IMAP_INC_DIR=$i$1
     break
-  elif test -r "$i$1/rfc822.h"; then 
-    IMAP_DIR=$i; 
+  elif test -r "$i$1/rfc822.h"; then
+    IMAP_DIR=$i;
     IMAP_INC_DIR=$i$1
-	break
+    break
 ])
 
 AC_DEFUN([IMAP_LIB_CHK],[
@@ -52,14 +52,14 @@ AC_DEFUN([PHP_IMAP_KRB_CHK], [
     [
       AC_DEFINE(HAVE_IMAP_KRB,1,[ ])
     ], [
-      AC_MSG_ERROR([Kerberos libraries not found. 
-      
+      AC_MSG_ERROR([Kerberos libraries not found.
+
       Check the path given to --with-kerberos (if no path is given, searches in /usr/kerberos, /usr/local and /usr )
       ])
     ])
   else
     AC_EGREP_HEADER(auth_gss, $IMAP_INC_DIR/linkage.h, [
-      AC_MSG_ERROR([This c-client library is built with Kerberos support. 
+      AC_MSG_ERROR([This c-client library is built with Kerberos support.
 
       Add --with-kerberos to your configure line. Check config.log for details.
       ])
@@ -76,14 +76,14 @@ AC_DEFUN([PHP_IMAP_SSL_CHK], [
     [
       AC_DEFINE(HAVE_IMAP_SSL,1,[ ])
     ], [
-      AC_MSG_ERROR([OpenSSL libraries not found. 
-      
+      AC_MSG_ERROR([OpenSSL libraries not found.
+
       Check the path given to --with-openssl-dir and output in config.log)
       ])
     ])
   elif test -f "$IMAP_INC_DIR/linkage.c"; then
     AC_EGREP_HEADER(ssl_onceonlyinit, $IMAP_INC_DIR/linkage.c, [
-      AC_MSG_ERROR([This c-client library is built with SSL support. 
+      AC_MSG_ERROR([This c-client library is built with SSL support.
 
       Add --with-imap-ssl to your configure line. Check config.log for details.
       ])
@@ -102,7 +102,7 @@ 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)
 
 
-if test "$PHP_IMAP" != "no"; then  
+if test "$PHP_IMAP" != "no"; then
     PHP_SUBST(IMAP_SHARED_LIBADD)
     PHP_NEW_EXTENSION(imap, php_imap.c, $ext_shared)
     AC_DEFINE(HAVE_IMAP,1,[ ])
@@ -178,18 +178,18 @@ if test "$PHP_IMAP" != "no"; then
     ],[])
     CPPFLAGS=$old_CPPFLAGS
 
-    PHP_CHECK_LIBRARY(pam, pam_start, 
+    PHP_CHECK_LIBRARY(pam, pam_start,
     [
       PHP_ADD_LIBRARY(pam,, IMAP_SHARED_LIBADD)
       AC_DEFINE(HAVE_LIBPAM,1,[ ])
     ])
 
-    PHP_CHECK_LIBRARY(crypt, crypt, 
+    PHP_CHECK_LIBRARY(crypt, crypt,
     [
       PHP_ADD_LIBRARY(crypt,, IMAP_SHARED_LIBADD)
       AC_DEFINE(HAVE_LIBCRYPT,1,[ ])
     ])
-	    
+
     PHP_EXPAND_PATH($IMAP_DIR, IMAP_DIR)
 
     if test -z "$IMAP_DIR"; then
diff --git a/ext/interbase/config.m4 b/ext/interbase/config.m4
index 5b4cde5852..1712f55788 100644
--- a/ext/interbase/config.m4
+++ b/ext/interbase/config.m4
@@ -46,7 +46,7 @@ if test "$PHP_INTERBASE" != "no"; then
     ], [
       -L$IBASE_LIBDIR
     ])
-  
+
     PHP_ADD_LIBRARY_WITH_PATH($IBASE_LIBNAME, $IBASE_LIBDIR, INTERBASE_SHARED_LIBADD)
     PHP_ADD_INCLUDE($IBASE_INCDIR)
   fi
diff --git a/ext/mysqli/config.m4 b/ext/mysqli/config.m4
index a8d5106aaf..38a130f4cd 100644
--- a/ext/mysqli/config.m4
+++ b/ext/mysqli/config.m4
@@ -29,11 +29,11 @@ AC_DEFUN([PHP_MYSQL_SOCKET_SEARCH], [
 
 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 
+                          to mysql_config.  If no value or mysqlnd is passed
                           as FILE, the MySQL native driver will be used])
 
 PHP_ARG_ENABLE(embedded_mysqli, whether to enable embedded MySQLi support,
-[  --enable-embedded-mysqli  
+[  --enable-embedded-mysqli
                           MYSQLi: Enable embedded support
                           Note: Does not work with MySQL native driver!], no, no)
 
@@ -63,7 +63,7 @@ elif test "$PHP_MYSQLI" != "no"; then
   else
     MYSQL_LIB_CFG='--libs'
   fi
-  
+
   if test -x "$MYSQL_CONFIG" && $MYSQL_CONFIG $MYSQL_LIB_CFG > /dev/null 2>&1; then
     MYSQLI_INCLINE=`$MYSQL_CONFIG --cflags | $SED -e "s/'//g"`
     MYSQLI_LIBLINE=`$MYSQL_CONFIG $MYSQL_LIB_CFG | $SED -e "s/'//g"`
diff --git a/ext/oci8/config.m4 b/ext/oci8/config.m4
index efcc09b5de..b554a4ac9d 100644
--- a/ext/oci8/config.m4
+++ b/ext/oci8/config.m4
@@ -66,8 +66,8 @@ AC_DEFUN([AC_OCI8_ORACLE_VERSION],[
     OCI8_ORACLE_VERSION=8.1
   elif test -f $OCI8_LCS_BASE.1.0; then
     OCI8_ORACLE_VERSION=8.0
-  elif test -f $OCI8_DIR/$OCI8_LIB_DIR/libclntsh.a; then 
-    if test -f $OCI8_DIR/$OCI8_LIB_DIR/libcore4.a; then 
+  elif test -f $OCI8_DIR/$OCI8_LIB_DIR/libclntsh.a; then
+    if test -f $OCI8_DIR/$OCI8_LIB_DIR/libcore4.a; then
       OCI8_ORACLE_VERSION=8.0
     else
       OCI8_ORACLE_VERSION=8.1
@@ -86,7 +86,7 @@ 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 
+dnl
 AC_DEFUN([OCI8_INIT_DTRACE],[
   ac_srcdir=[]PHP_EXT_SRCDIR([oci8])/
   ac_bdir=[]PHP_EXT_BUILDDIR([oci8])/
@@ -173,7 +173,7 @@ PHP_ARG_WITH(oci8, for Oracle Database OCI8 support,
                           Use --with-oci8=instantclient,/path/to/instant/client/lib
                           to use an Oracle Instant Client installation])
 
-if test "$PHP_OCI8" != "no"; then 
+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
@@ -211,12 +211,12 @@ if test "$PHP_OCI8" != "no"; then
   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 To use DTrace with a PECL install, extract the OCI8 archive, phpize it, and set
   dnl PHP_DTRACE=yes before running 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
-    AC_MSG_RESULT([yes])    
+    AC_MSG_RESULT([yes])
     if test "$ext_shared" = "no"; then
       AC_MSG_ERROR([For DTrace support OCI8 must be configured as a shared extension])
     else
@@ -242,7 +242,7 @@ if test "$PHP_OCI8" != "no"; then
   AC_MSG_CHECKING([checking if we're on a 64-bit platform])
   if test "$ac_cv_sizeof_long_int" = "4"; then
     AC_MSG_RESULT([no])
-    PHP_OCI8_OH_LIBDIR=lib32 
+    PHP_OCI8_OH_LIBDIR=lib32
     PHP_OCI8_IC_LIBDIR_SUFFIX=""
   else
     AC_MSG_RESULT([yes])
diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4
index a75fc77747..5d5456e3be 100644
--- a/ext/odbc/config.m4
+++ b/ext/odbc/config.m4
@@ -10,28 +10,28 @@ dnl
 dnl Figure out which library file to link with for the Solid support.
 dnl
 AC_DEFUN([PHP_ODBC_FIND_SOLID_LIBS],[
-  AC_MSG_CHECKING([Solid library file])  
+  AC_MSG_CHECKING([Solid library file])
   ac_solid_uname_r=`uname -r 2>/dev/null`
   ac_solid_uname_s=`uname -s 2>/dev/null`
   case $ac_solid_uname_s in
     AIX) ac_solid_os=a3x;;   # a4x for AIX4/ Solid 2.3/3.0 only
     HP-UX) ac_solid_os=h9x;; # h1x for hpux11, h0x for hpux10
     IRIX) ac_solid_os=irx;;  # Solid 2.3(?)/ 3.0 only
-    Linux) 
+    Linux)
       if ldd -v /bin/sh | grep GLIBC > /dev/null; then
         AC_DEFINE(SS_LINUX,1,[Needed in sqlunix.h ])
         ac_solid_os=l2x
       else
         AC_DEFINE(SS_LINUX,1,[Needed in sqlunix.h ])
         ac_solid_os=lux
-      fi;; 
-    SunOS) 
+      fi;;
+    SunOS)
       ac_solid_os=ssx;; # should we deal with SunOS 4?
-    FreeBSD) 
+    FreeBSD)
       if test `expr $ac_solid_uname_r : '\(.\)'` -gt "2"; then
         AC_DEFINE(SS_FBX,1,[Needed in sqlunix.h for wchar defs ])
         ac_solid_os=fex
-      else 
+      else
         AC_DEFINE(SS_FBX,1,[Needed in sqlunix.h for wchar defs ])
         ac_solid_os=fbx
       fi;;
@@ -287,7 +287,7 @@ 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 
+                          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\"
@@ -320,7 +320,7 @@ PHP_ARG_WITH(iodbc,,
   if test "$PHP_IODBC" != "no"; then
     if test -z "$PKG_CONFIG"; then
       AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-    fi 
+    fi
     if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libiodbc ; then
       PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
       ODBC_TYPE=iodbc
@@ -466,7 +466,7 @@ if test -n "$ODBC_TYPE"; then
       AC_DEFINE(HAVE_SQLDATASOURCES,1,[ ])
     fi
   fi
-  
+
   AC_DEFINE(HAVE_UODBC,1,[ ])
   PHP_SUBST(ODBC_SHARED_LIBADD)
   PHP_SUBST(ODBC_INCDIR)
diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4
index 74885ddbe2..d4b2753c18 100644
--- a/ext/opcache/config.m4
+++ b/ext/opcache/config.m4
@@ -346,12 +346,12 @@ AC_MSG_CHECKING("whether flock struct is linux ordered")
 AC_TRY_RUN([
   #include <fcntl.h>
   struct flock lock = { 1, 2, 3, 4, 5 };
-  int main() { 
+  int main() {
     if(lock.l_type == 1 && lock.l_whence == 2 && lock.l_start == 3 && lock.l_len == 4) {
 		return 0;
     }
     return 1;
-  } 
+  }
 ], [
 	flock_type=linux
     AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type])
@@ -362,15 +362,15 @@ AC_MSG_CHECKING("whether flock struct is BSD ordered")
 AC_TRY_RUN([
   #include <fcntl.h>
   struct flock lock = { 1, 2, 3, 4, 5 };
-  int main() { 
+  int main() {
     if(lock.l_start == 1 && lock.l_len == 2 && lock.l_type == 4 && lock.l_whence == 5) {
 		return 0;
     }
     return 1;
-  } 
+  }
 ], [
 	flock_type=bsd
-    AC_DEFINE([HAVE_FLOCK_BSD], [], [Struct flock is BSD-type]) 
+    AC_DEFINE([HAVE_FLOCK_BSD], [], [Struct flock is BSD-type])
     AC_MSG_RESULT("yes")
 ], AC_MSG_RESULT("no") )
 
diff --git a/ext/openssl/config0.m4 b/ext/openssl/config0.m4
index 5dc60ea7f0..a707ea525e 100644
--- a/ext/openssl/config0.m4
+++ b/ext/openssl/config0.m4
@@ -19,7 +19,7 @@ if test "$PHP_OPENSSL" != "no"; then
 
   AC_CHECK_FUNCS([RAND_egd])
 
-  PHP_SETUP_OPENSSL(OPENSSL_SHARED_LIBADD, 
+  PHP_SETUP_OPENSSL(OPENSSL_SHARED_LIBADD,
   [
     AC_DEFINE(HAVE_OPENSSL_EXT,1,[ ])
   ], [
diff --git a/ext/pcre/config0.m4 b/ext/pcre/config0.m4
index 26392d7b8b..dd1b7d55aa 100644
--- a/ext/pcre/config0.m4
+++ b/ext/pcre/config0.m4
@@ -54,7 +54,7 @@ PHP_ARG_WITH(pcre-jit,,[  --with-pcre-jit         Enable PCRE JIT functionality
     ],[
       $PCRE2_LIB
     ])
-    
+
     PHP_EVAL_INCLINE($PCRE2_INC)
     PHP_EVAL_LIBLINE($PCRE2_LIB)
     AC_DEFINE(HAVE_PCRE, 1, [ ])
diff --git a/ext/pdo/config.m4 b/ext/pdo/config.m4
index d381a138fb..a42b6a3a88 100755
--- a/ext/pdo/config.m4
+++ b/ext/pdo/config.m4
@@ -41,7 +41,7 @@ if test "$PHP_PDO" != "no"; then
   [
     PHP_ADD_EXTENSION_DEP(pdo, spl, true)
   ])
-  
+
   ifdef([PHP_INSTALL_HEADERS],
   [
     dnl Sadly, this is a complete NOP for pecl extensions
diff --git a/ext/pdo_dblib/config.m4 b/ext/pdo_dblib/config.m4
index f93fe57927..3f2bcc477d 100644
--- a/ext/pdo_dblib/config.m4
+++ b/ext/pdo_dblib/config.m4
@@ -38,7 +38,7 @@ if test "$PHP_PDO_DBLIB" != "no"; then
     else
       AC_MSG_ERROR(Directory $PHP_PDO_DBLIB is not a FreeTDS installation directory)
     fi
-  fi  
+  fi
 
   if test "x$PHP_LIBDIR" = "x" ; then
     PHP_LIBDIR=lib
diff --git a/ext/pdo_firebird/config.m4 b/ext/pdo_firebird/config.m4
index e6362cd7a0..0f7f3c7be8 100644
--- a/ext/pdo_firebird/config.m4
+++ b/ext/pdo_firebird/config.m4
@@ -55,7 +55,7 @@ if test "$PHP_PDO_FIREBIRD" != "no"; then
     PHP_ADD_LIBRARY_WITH_PATH($FIREBIRD_LIBNAME, $FIREBIRD_LIBDIR, PDO_FIREBIRD_SHARED_LIBADD)
     PHP_ADD_INCLUDE($FIREBIRD_INCDIR)
   fi
- 
+
   PHP_CHECK_PDO_INCLUDES
 
   AC_DEFINE(HAVE_PDO_FIREBIRD,1,[ ])
diff --git a/ext/pdo_mysql/config.m4 b/ext/pdo_mysql/config.m4
index 43edf3fc4a..3e37a6adec 100755
--- a/ext/pdo_mysql/config.m4
+++ b/ext/pdo_mysql/config.m4
@@ -52,7 +52,7 @@ if test "$PHP_PDO_MYSQL" != "no"; then
       fi
     fi
   fi
-  
+
   if test "$PHP_PDO_MYSQL" = "yes" || test "$PHP_PDO_MYSQL" = "mysqlnd"; then
     dnl enables build of mysqnd library
     PHP_MYSQLND_ENABLED=yes
@@ -112,8 +112,8 @@ if test "$PHP_PDO_MYSQL" != "no"; then
         PHP_CHECK_LIBRARY($PDO_MYSQL_LIBNAME, mysql_commit, [], [
           AC_MSG_ERROR([PDO_MYSQL configure failed, MySQL 4.1 needed. Please check config.log for more information.])
         ], [
-          -L$PHP_ZLIB_DIR/$PHP_LIBDIR -L$PDO_MYSQL_LIB_DIR 
-        ])  
+          -L$PHP_ZLIB_DIR/$PHP_LIBDIR -L$PDO_MYSQL_LIB_DIR
+        ])
         PDO_MYSQL_LIBS="$PDO_MYSQL_LIBS -L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz"
       else
         PHP_ADD_LIBRARY(z,, PDO_MYSQL_SHARED_LIBADD)
@@ -121,7 +121,7 @@ if test "$PHP_PDO_MYSQL" != "no"; then
           AC_MSG_ERROR([Try adding --with-zlib-dir=<DIR>. Please check config.log for more information.])
         ], [
           -L$PDO_MYSQL_LIB_DIR
-        ])   
+        ])
         PDO_MYSQL_LIBS="$PDO_MYSQL_LIBS -lz"
       fi
 
diff --git a/ext/pdo_oci/config.m4 b/ext/pdo_oci/config.m4
index 99f730d425..75f133cdb4 100755
--- a/ext/pdo_oci/config.m4
+++ b/ext/pdo_oci/config.m4
@@ -56,7 +56,7 @@ AC_DEFUN([AC_PDO_OCI_CHECK_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 
+                          Use --with-pdo-oci=instantclient,/path/to/instant/client/lib
                           for an Oracle Instant Client installation.])
 
 if test "$PHP_PDO_OCI" != "no"; then
@@ -96,11 +96,11 @@ if test "$PHP_PDO_OCI" != "no"; then
 
     dnl Header directory for manual installation
     OCISDKMANINC=`echo "$PDO_OCI_LIB_DIR" | $PHP_PDO_OCI_SED -e 's!^\(.*\)/lib[/]*$!\1/include!'`
-    
+
     dnl Header directory for Instant Client SDK zip file install
     OCISDKZIPINC=$PDO_OCI_LIB_DIR/sdk/include
 
-    
+
     if test -f "$OCISDKRPMINC/oci.h" ; then
       PHP_ADD_INCLUDE($OCISDKRPMINC)
       AC_MSG_RESULT($OCISDKRPMINC)
@@ -169,7 +169,7 @@ if test "$PHP_PDO_OCI" != "no"; then
   ])
 
   dnl
-  dnl Check if we need to add -locijdbc8 
+  dnl Check if we need to add -locijdbc8
   dnl
   PHP_CHECK_LIBRARY(clntsh, OCILobIsTemporary,
   [
diff --git a/ext/pdo_odbc/config.m4 b/ext/pdo_odbc/config.m4
index 467e923640..785e302da9 100755
--- a/ext/pdo_odbc/config.m4
+++ b/ext/pdo_odbc/config.m4
@@ -5,13 +5,13 @@ 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 
+			  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\" 
+			  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
@@ -33,7 +33,7 @@ AC_DEFUN([PDO_ODBC_CHECK_HEADER],[
     AC_MSG_RESULT(no)
   fi
 ])
-                                  
+
 if test "$PHP_PDO_ODBC" != "no"; then
 
   if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then
@@ -110,7 +110,7 @@ if test "$PHP_PDO_ODBC" != "no"; then
     PDO_ODBC_INCDIR="$pdo_odbc_def_incdir"
     PDO_ODBC_LIBDIR="$pdo_odbc_def_libdir"
   fi
-  
+
   AC_MSG_RESULT([$pdo_odbc_flavour
           libs       $PDO_ODBC_LIBDIR,
           headers    $PDO_ODBC_INCDIR])
diff --git a/ext/pgsql/config.m4 b/ext/pgsql/config.m4
index 32b4210f1b..953678a376 100644
--- a/ext/pgsql/config.m4
+++ b/ext/pgsql/config.m4
@@ -29,7 +29,7 @@ if test "$PHP_PGSQL" != "no"; then
     else
       PGSQL_SEARCH_PATHS=$PHP_PGSQL
     fi
-  
+
     for i in $PGSQL_SEARCH_PATHS; do
       for j in include include/pgsql include/postgres include/postgresql ""; do
         if test -r "$i/$j/libpq-fe.h"; then
@@ -42,7 +42,7 @@ if test "$PHP_PGSQL" != "no"; then
       done
 
       for j in lib $PHP_LIBDIR/pgsql $PHP_LIBDIR/postgres $PHP_LIBDIR/postgresql ""; do
-        if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then 
+        if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then
           PGSQL_LIBDIR=$i/$j
         fi
       done
diff --git a/ext/readline/config.m4 b/ext/readline/config.m4
index a0b5da267a..e8c6b91c68 100644
--- a/ext/readline/config.m4
+++ b/ext/readline/config.m4
@@ -1,6 +1,6 @@
 dnl config.m4 for extension readline
 
-PHP_ARG_WITH(libedit,for libedit readline replacement, 
+PHP_ARG_WITH(libedit,for libedit readline replacement,
 [  --with-libedit[=DIR]      Include libedit readline replacement (CLI/CGI only)])
 
 if test "$PHP_LIBEDIT" = "no"; then
@@ -91,11 +91,11 @@ elif test "$PHP_LIBEDIT" != "no"; then
 
   PHP_CHECK_LIBRARY(edit, readline,
   [
-    PHP_ADD_LIBRARY_WITH_PATH(edit, $LIBEDIT_DIR/$PHP_LIBDIR, READLINE_SHARED_LIBADD)  
+    PHP_ADD_LIBRARY_WITH_PATH(edit, $LIBEDIT_DIR/$PHP_LIBDIR, READLINE_SHARED_LIBADD)
   ], [
     AC_MSG_ERROR(edit library required by readline not found)
   ], [
-    -L$READLINE_DIR/$PHP_LIBDIR 
+    -L$READLINE_DIR/$PHP_LIBDIR
   ])
 
   PHP_CHECK_LIBRARY(edit, rl_callback_read_char,
diff --git a/ext/shmop/config.m4 b/ext/shmop/config.m4
index 5895293ea9..79642f37d9 100644
--- a/ext/shmop/config.m4
+++ b/ext/shmop/config.m4
@@ -1,6 +1,6 @@
 dnl config.m4 for extension shmop
 
-PHP_ARG_ENABLE(shmop, whether to enable shmop support, 
+PHP_ARG_ENABLE(shmop, whether to enable shmop support,
 [  --enable-shmop          Enable shmop support])
 
 if test "$PHP_SHMOP" != "no"; then
diff --git a/ext/simplexml/config.m4 b/ext/simplexml/config.m4
index 8545ad8090..f05a477259 100644
--- a/ext/simplexml/config.m4
+++ b/ext/simplexml/config.m4
@@ -10,8 +10,8 @@ fi
 
 if test "$PHP_SIMPLEXML" != "no"; then
 
-  if test "$PHP_LIBXML" = "no"; then   
-    AC_MSG_ERROR([SimpleXML extension requires LIBXML extension, add --enable-libxml])                
+  if test "$PHP_LIBXML" = "no"; then
+    AC_MSG_ERROR([SimpleXML extension requires LIBXML extension, add --enable-libxml])
   fi
 
   PHP_SETUP_LIBXML(SIMPLEXML_SHARED_LIBADD, [
diff --git a/ext/snmp/config.m4 b/ext/snmp/config.m4
index 55eab6b3df..2b82623212 100644
--- a/ext/snmp/config.m4
+++ b/ext/snmp/config.m4
@@ -35,7 +35,7 @@ if test "$PHP_SNMP" != "no"; then
     else
       AC_MSG_ERROR([Net-SNMP version 5.3 or greater reqired (detected $snmp_full_version).])
     fi
-  else 
+  else
     AC_MSG_ERROR([Could not find net-snmp-config binary. Please check your net-snmp installation.])
   fi
 
diff --git a/ext/soap/config.m4 b/ext/soap/config.m4
index 454c61af3c..d0a99d9624 100644
--- a/ext/soap/config.m4
+++ b/ext/soap/config.m4
@@ -10,8 +10,8 @@ fi
 
 if test "$PHP_SOAP" != "no"; then
 
-  if test "$PHP_LIBXML" = "no"; then   
-    AC_MSG_ERROR([SOAP extension requires LIBXML extension, add --enable-libxml])                
+  if test "$PHP_LIBXML" = "no"; then
+    AC_MSG_ERROR([SOAP extension requires LIBXML extension, add --enable-libxml])
   fi
 
   PHP_SETUP_LIBXML(SOAP_SHARED_LIBADD, [
diff --git a/ext/spl/config.m4 b/ext/spl/config.m4
index 48977f0a49..4ad29f3c94 100755
--- a/ext/spl/config.m4
+++ b/ext/spl/config.m4
@@ -1,6 +1,6 @@
 dnl config.m4 for extension SPL
 
-  AC_DEFINE(HAVE_SPL, 1, [Whether you want SPL (Standard PHP Library) support]) 
+  AC_DEFINE(HAVE_SPL, 1, [Whether you want SPL (Standard PHP Library) support])
   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/xml/config.m4 b/ext/xml/config.m4
index 1b58340650..d07b515b77 100644
--- a/ext/xml/config.m4
+++ b/ext/xml/config.m4
@@ -13,7 +13,7 @@ PHP_ARG_WITH(libexpat-dir, libexpat install dir,
 
 if test "$PHP_XML" != "no"; then
 
-  dnl 
+  dnl
   dnl Default to libxml2 if --with-libexpat-dir is not used.
   dnl
   if test "$PHP_LIBEXPAT_DIR" = "no"; then
@@ -29,7 +29,7 @@ if test "$PHP_XML" != "no"; then
       AC_MSG_ERROR([libxml2 not found. Use --with-libxml-dir=<DIR>])
     ])
   fi
-  
+
   dnl
   dnl Check for expat only if --with-libexpat-dir is used.
   dnl
diff --git a/ext/xmlrpc/config.m4 b/ext/xmlrpc/config.m4
index 8d0fa6529a..93429c6840 100644
--- a/ext/xmlrpc/config.m4
+++ b/ext/xmlrpc/config.m4
@@ -65,11 +65,11 @@ if test "$PHP_XMLRPC" != "no"; then
     if test "$PHP_ICONV_DIR" != "no"; then
       PHP_ICONV=$PHP_ICONV_DIR
     fi
-  
+
     if test -z "$PHP_ICONV" || test "$PHP_ICONV" = "no"; then
       PHP_ICONV=yes
     fi
-  
+
     PHP_SETUP_ICONV(XMLRPC_SHARED_LIBADD, [], [
       AC_MSG_ERROR([iconv not found, in order to build xmlrpc you need the iconv library])
     ])
diff --git a/ext/xsl/config.m4 b/ext/xsl/config.m4
index 0cceac4915..ccf6de1839 100644
--- a/ext/xsl/config.m4
+++ b/ext/xsl/config.m4
@@ -9,7 +9,7 @@ if test "$PHP_XSL" != "no"; then
   if test "$PHP_LIBXML" = "no"; then
     AC_MSG_ERROR([XSL extension requires LIBXML extension, add --enable-libxml])
   fi
-  
+
   if test "$PHP_DOM" = "no"; then
     AC_MSG_ERROR([XSL extension requires DOM extension, add --enable-dom])
   fi
@@ -35,7 +35,7 @@ if test "$PHP_XSL" != "no"; then
       XSL_INCS=`$XSLT_CONFIG --cflags`
       PHP_EVAL_LIBLINE($XSL_LIBS, XSL_SHARED_LIBADD)
       PHP_EVAL_INCLINE($XSL_INCS)
-      
+
       AC_MSG_CHECKING([for EXSLT support])
       for i in $PHP_XSL /usr/local /usr; do
         if test -r "$i/include/libexslt/exslt.h"; then
@@ -45,7 +45,7 @@ if test "$PHP_XSL" != "no"; then
       done
       if test -z "$PHP_XSL_EXSL_DIR"; then
         AC_MSG_RESULT(not found)
-      else 
+      else
         AC_MSG_RESULT(found)
         PHP_ADD_LIBRARY_WITH_PATH(exslt, $PHP_XSL_EXSL_DIR/$PHP_LIBDIR, XSL_SHARED_LIBADD)
         PHP_ADD_INCLUDE($PHP_XSL_EXSL_DIR/include)
@@ -54,10 +54,10 @@ if test "$PHP_XSL" != "no"; then
     else
       AC_MSG_ERROR([libxslt version 1.1.0 or greater required.])
     fi
-    
-  
+
+
   fi
-  
+
   AC_DEFINE(HAVE_XSL,1,[ ])
   PHP_NEW_EXTENSION(xsl, php_xsl.c xsltprocessor.c, $ext_shared)
   PHP_SUBST(XSL_SHARED_LIBADD)
diff --git a/ext/zlib/config0.m4 b/ext/zlib/config0.m4
index 072adb823a..06c6cfae83 100644
--- a/ext/zlib/config0.m4
+++ b/ext/zlib/config0.m4
@@ -9,8 +9,8 @@ PHP_ARG_WITH(zlib-dir,if the location of ZLIB install directory is defined,
 if test "$PHP_ZLIB" != "no" || test "$PHP_ZLIB_DIR" != "no"; then
   PHP_NEW_EXTENSION(zlib, zlib.c zlib_fopen_wrapper.c zlib_filter.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
   PHP_SUBST(ZLIB_SHARED_LIBADD)
-  
-  if test "$PHP_ZLIB" != "yes" -a "$PHP_ZLIB" != "no"; then 
+
+  if test "$PHP_ZLIB" != "yes" -a "$PHP_ZLIB" != "no"; then
     if test -f $PHP_ZLIB/include/zlib/zlib.h; then
       ZLIB_DIR=$PHP_ZLIB
       ZLIB_INCDIR=$ZLIB_DIR/include/zlib
@@ -18,7 +18,7 @@ if test "$PHP_ZLIB" != "no" || test "$PHP_ZLIB_DIR" != "no"; then
       ZLIB_DIR=$PHP_ZLIB
       ZLIB_INCDIR=$ZLIB_DIR/include
     fi
-  else 
+  else
     for i in /usr/local /usr $PHP_ZLIB_DIR; do
       if test -f $i/include/zlib/zlib.h; then
         ZLIB_DIR=$i
@@ -29,13 +29,13 @@ if test "$PHP_ZLIB" != "no" || test "$PHP_ZLIB_DIR" != "no"; then
       fi
     done
   fi
-  
+
   if test -z "$ZLIB_DIR"; then
     AC_MSG_ERROR(Cannot find libz)
   fi
 
   case $ZLIB_DIR in
-  /usr) ac_extra= ;; 
+  /usr) ac_extra= ;;
   *) ac_extra=-L$ZLIB_DIR/$PHP_LIBDIR ;;
   esac
 
@@ -47,7 +47,7 @@ if test "$PHP_ZLIB" != "no" || test "$PHP_ZLIB_DIR" != "no"; then
   fi
 
   PHP_CHECK_LIBRARY(z, gzgets, [
-    AC_DEFINE(HAVE_ZLIB,1,[ ]) 
+    AC_DEFINE(HAVE_ZLIB,1,[ ])
   ],[
     AC_MSG_ERROR(ZLIB extension requires gzgets in zlib)
   ],[