Use spaces for indentation, not tabs.

108 files changed, 1438 insertions, 1438 deletions

diff --git a/m4/absolute-header.m4 b/m4/absolute-header.m4
index bc25711053..768443aa04 100644
--- a/m4/absolute-header.m4
+++ b/m4/absolute-header.m4
@@ -49,10 +49,10 @@ m4_foreach_w([gl_HEADER_NAME], [$1],
       AS_VAR_SET(gl_absolute_header,
 [`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD |
 sed -n '\#/]m4_defn([gl_HEADER_NAME])[#{
-	s#.*"\(.*/]m4_defn([gl_HEADER_NAME])[\)".*#\1#
-	s#^/[^/]#//&#
-	p
-	q
+        s#.*"\(.*/]m4_defn([gl_HEADER_NAME])[\)".*#\1#
+        s#^/[^/]#//&#
+        p
+        q
 }'`])
     fi
     AS_VAR_POPDEF([ac_header_exists])dnl
diff --git a/m4/acl.m4 b/m4/acl.m4
index 784f4ea2e6..8d6d2c0192 100644
--- a/m4/acl.m4
+++ b/m4/acl.m4
@@ -26,90 +26,90 @@ AC_DEFUN([gl_FUNC_ACL],
       dnl Test for POSIX-draft-like API (Linux, FreeBSD, MacOS X, IRIX, Tru64).
       dnl -lacl is needed on Linux, -lpacl is needed on OSF/1.
       if test $use_acl = 0; then
-	AC_SEARCH_LIBS([acl_get_file], [acl pacl],
-	  [if test "$ac_cv_search_acl_get_file" != "none required"; then
-	     LIB_ACL=$ac_cv_search_acl_get_file
+        AC_SEARCH_LIBS([acl_get_file], [acl pacl],
+          [if test "$ac_cv_search_acl_get_file" != "none required"; then
+             LIB_ACL=$ac_cv_search_acl_get_file
            fi
-	   AC_CHECK_FUNCS(
-	     [acl_get_file acl_get_fd acl_set_file acl_set_fd \
-	      acl_free acl_from_mode acl_from_text \
-	      acl_delete_def_file acl_extended_file \
-	      acl_delete_fd_np acl_delete_file_np \
-	      acl_copy_ext_native acl_create_entry_np \
-	      acl_to_short_text acl_free_text])
-	   # If the acl_get_file bug is detected, don't enable the ACL support.
-	   gl_ACL_GET_FILE([use_acl=1], [])
-	   if test $use_acl = 1; then
-	     dnl On Linux, additional API is declared in <acl/libacl.h>.
-	     AC_CHECK_HEADERS([acl/libacl.h])
-	     AC_REPLACE_FUNCS([acl_entries])
-	     AC_CACHE_CHECK([for ACL_FIRST_ENTRY],
-	       [gl_cv_acl_ACL_FIRST_ENTRY],
-	       [AC_COMPILE_IFELSE(
+           AC_CHECK_FUNCS(
+             [acl_get_file acl_get_fd acl_set_file acl_set_fd \
+              acl_free acl_from_mode acl_from_text \
+              acl_delete_def_file acl_extended_file \
+              acl_delete_fd_np acl_delete_file_np \
+              acl_copy_ext_native acl_create_entry_np \
+              acl_to_short_text acl_free_text])
+           # If the acl_get_file bug is detected, don't enable the ACL support.
+           gl_ACL_GET_FILE([use_acl=1], [])
+           if test $use_acl = 1; then
+             dnl On Linux, additional API is declared in <acl/libacl.h>.
+             AC_CHECK_HEADERS([acl/libacl.h])
+             AC_REPLACE_FUNCS([acl_entries])
+             AC_CACHE_CHECK([for ACL_FIRST_ENTRY],
+               [gl_cv_acl_ACL_FIRST_ENTRY],
+               [AC_COMPILE_IFELSE(
 [[#include <sys/types.h>
 #include <sys/acl.h>
 int type = ACL_FIRST_ENTRY;]],
-		  [gl_cv_acl_ACL_FIRST_ENTRY=yes],
-		  [gl_cv_acl_ACL_FIRST_ENTRY=no])])
-	     if test $gl_cv_acl_ACL_FIRST_ENTRY = yes; then
-	       AC_DEFINE([HAVE_ACL_FIRST_ENTRY], [1],
-		 [Define to 1 if the constant ACL_FIRST_ENTRY exists.])
-	     fi
-	     dnl On MacOS X, other types of ACLs are supported.
-	     AC_CACHE_CHECK([for ACL_TYPE_EXTENDED],
-	       [gl_cv_acl_ACL_TYPE_EXTENDED],
-	       [AC_COMPILE_IFELSE(
+                  [gl_cv_acl_ACL_FIRST_ENTRY=yes],
+                  [gl_cv_acl_ACL_FIRST_ENTRY=no])])
+             if test $gl_cv_acl_ACL_FIRST_ENTRY = yes; then
+               AC_DEFINE([HAVE_ACL_FIRST_ENTRY], [1],
+                 [Define to 1 if the constant ACL_FIRST_ENTRY exists.])
+             fi
+             dnl On MacOS X, other types of ACLs are supported.
+             AC_CACHE_CHECK([for ACL_TYPE_EXTENDED],
+               [gl_cv_acl_ACL_TYPE_EXTENDED],
+               [AC_COMPILE_IFELSE(
 [[#include <sys/types.h>
 #include <sys/acl.h>
 int type = ACL_TYPE_EXTENDED;]],
-		  [gl_cv_acl_ACL_TYPE_EXTENDED=yes],
-		  [gl_cv_acl_ACL_TYPE_EXTENDED=no])])
-	     if test $gl_cv_acl_ACL_TYPE_EXTENDED = yes; then
-	       AC_DEFINE([HAVE_ACL_TYPE_EXTENDED], [1],
-		 [Define to 1 if the ACL type ACL_TYPE_EXTENDED exists.])
-	     fi
-	   else
-	     LIB_ACL=
-	   fi
-	  ])
+                  [gl_cv_acl_ACL_TYPE_EXTENDED=yes],
+                  [gl_cv_acl_ACL_TYPE_EXTENDED=no])])
+             if test $gl_cv_acl_ACL_TYPE_EXTENDED = yes; then
+               AC_DEFINE([HAVE_ACL_TYPE_EXTENDED], [1],
+                 [Define to 1 if the ACL type ACL_TYPE_EXTENDED exists.])
+             fi
+           else
+             LIB_ACL=
+           fi
+          ])
       fi
 
       dnl Test for Solaris API (Solaris, Cygwin).
       if test $use_acl = 0; then
-	AC_CHECK_FUNCS([acl])
-	if test $ac_cv_func_acl = yes; then
-	  AC_SEARCH_LIBS([acl_trivial], [sec],
-	    [if test "$ac_cv_search_acl_trivial" != "none required"; then
-	       LIB_ACL=$ac_cv_search_acl_trivial
-	     fi
-	    ])
-	  AC_CHECK_FUNCS([acl_trivial])
-	  use_acl=1
-	fi
+        AC_CHECK_FUNCS([acl])
+        if test $ac_cv_func_acl = yes; then
+          AC_SEARCH_LIBS([acl_trivial], [sec],
+            [if test "$ac_cv_search_acl_trivial" != "none required"; then
+               LIB_ACL=$ac_cv_search_acl_trivial
+             fi
+            ])
+          AC_CHECK_FUNCS([acl_trivial])
+          use_acl=1
+        fi
       fi
 
       dnl Test for HP-UX API.
       if test $use_acl = 0 || test "$ac_cv_func_acl" = yes; then
-	AC_CHECK_FUNCS([getacl])
-	if test $ac_cv_func_getacl = yes; then
-	  use_acl=1
-	fi
+        AC_CHECK_FUNCS([getacl])
+        if test $ac_cv_func_getacl = yes; then
+          use_acl=1
+        fi
       fi
 
       dnl Test for AIX API (AIX 5.3 or newer).
       if test $use_acl = 0; then
-	AC_CHECK_FUNCS([aclx_get])
-	if test $ac_cv_func_aclx_get = yes; then
-	  use_acl=1
-	fi
+        AC_CHECK_FUNCS([aclx_get])
+        if test $ac_cv_func_aclx_get = yes; then
+          use_acl=1
+        fi
       fi
 
       dnl Test for older AIX API.
       if test $use_acl = 0 || test "$ac_cv_func_aclx_get" = yes; then
-	AC_CHECK_FUNCS([statacl])
-	if test $ac_cv_func_statacl = yes; then
-	  use_acl=1
-	fi
+        AC_CHECK_FUNCS([statacl])
+        if test $ac_cv_func_statacl = yes; then
+          use_acl=1
+        fi
       fi
 
       LIBS=$ac_save_LIBS
@@ -139,12 +139,12 @@ AC_DEFUN([gl_ACL_GET_FILE],
   AC_CACHE_CHECK([for working acl_get_file], [gl_cv_func_working_acl_get_file],
     [AC_RUN_IFELSE(
        [AC_LANG_PROGRAM(
-	  [[#include <sys/types.h>
-	   #include <sys/acl.h>
-	   #include <errno.h>
-	  ]],
-	  [[return !! (!acl_get_file (".", ACL_TYPE_ACCESS)
-		       && errno == ENOENT);]])],
+          [[#include <sys/types.h>
+           #include <sys/acl.h>
+           #include <errno.h>
+          ]],
+          [[return !! (!acl_get_file (".", ACL_TYPE_ACCESS)
+                       && errno == ENOENT);]])],
        [gl_cv_func_working_acl_get_file=yes],
        [gl_cv_func_working_acl_get_file=no],
        [gl_cv_func_working_acl_get_file=cross-compiling])])
diff --git a/m4/afs.m4 b/m4/afs.m4
index f4b067cf74..1a2f9db586 100644
--- a/m4/afs.m4
+++ b/m4/afs.m4
@@ -8,8 +8,8 @@
 AC_DEFUN([gl_AFS],
   [
     AC_ARG_WITH([afs],
-		AS_HELP_STRING([--with-afs],
-			       [support for the Andrew File System [[default=no]]]),
+                AS_HELP_STRING([--with-afs],
+                               [support for the Andrew File System [[default=no]]]),
     test "$withval" = no || with_afs=yes, with_afs=no)
     if test "$with_afs" = yes; then
       AC_DEFINE([AFS], [1], [Define if you have the Andrew File System.])
diff --git a/m4/argp.m4 b/m4/argp.m4
index b2a6940501..86e08905d0 100644
--- a/m4/argp.m4
+++ b/m4/argp.m4
@@ -17,13 +17,13 @@ AC_DEFUN([gl_ARGP],
   AC_CHECK_DECL([program_invocation_name],
                 [AC_DEFINE([HAVE_DECL_PROGRAM_INVOCATION_NAME], [1],
                            [Define if program_invocation_name is declared])],
-	        [AC_DEFINE([GNULIB_PROGRAM_INVOCATION_NAME], [1],
+                [AC_DEFINE([GNULIB_PROGRAM_INVOCATION_NAME], [1],
                            [Define to 1 to add extern declaration of program_invocation_name to argp.h])],
                 [#include <errno.h>])
   AC_CHECK_DECL([program_invocation_short_name],
                 [AC_DEFINE([HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME], [1],
                            [Define if program_invocation_short_name is declared])],
-	        [AC_DEFINE([GNULIB_PROGRAM_INVOCATION_SHORT_NAME], [1],
+                [AC_DEFINE([GNULIB_PROGRAM_INVOCATION_SHORT_NAME], [1],
                            [Define to 1 to add extern declaration of program_invocation_short_name to argp.h])],
                 [#include <errno.h>])
 
diff --git a/m4/argz.m4 b/m4/argz.m4
index b77d48ab91..2119e0a24f 100644
--- a/m4/argz.m4
+++ b/m4/argz.m4
@@ -43,30 +43,30 @@ AS_IF([test -z "$ARGZ_H"],
         [if argz actually works],
         [lt_cv_sys_argz_works],
         [[case $host_os in #(
-	 *cygwin*)
-	   lt_cv_sys_argz_works=no
-	   if test "$cross_compiling" != no; then
-	     lt_cv_sys_argz_works="guessing no"
-	   else
-	     lt_sed_extract_leading_digits='s/^\([0-9\.]*\).*/\1/'
-	     save_IFS=$IFS
-	     IFS=-.
-	     set x `uname -r | sed -e "$lt_sed_extract_leading_digits"`
-	     IFS=$save_IFS
-	     lt_os_major=${2-0}
-	     lt_os_minor=${3-0}
-	     lt_os_micro=${4-0}
-	     if test "$lt_os_major" -gt 1 \
-		|| { test "$lt_os_major" -eq 1 \
-		  && { test "$lt_os_minor" -gt 5 \
-		    || { test "$lt_os_minor" -eq 5 \
-		      && test "$lt_os_micro" -gt 24; }; }; }; then
-	       lt_cv_sys_argz_works=yes
-	     fi
-	   fi
-	   ;; #(
-	 *) lt_cv_sys_argz_works=yes ;;
-	 esac]])
+         *cygwin*)
+           lt_cv_sys_argz_works=no
+           if test "$cross_compiling" != no; then
+             lt_cv_sys_argz_works="guessing no"
+           else
+             lt_sed_extract_leading_digits='s/^\([0-9\.]*\).*/\1/'
+             save_IFS=$IFS
+             IFS=-.
+             set x `uname -r | sed -e "$lt_sed_extract_leading_digits"`
+             IFS=$save_IFS
+             lt_os_major=${2-0}
+             lt_os_minor=${3-0}
+             lt_os_micro=${4-0}
+             if test "$lt_os_major" -gt 1 \
+                || { test "$lt_os_major" -eq 1 \
+                  && { test "$lt_os_minor" -gt 5 \
+                    || { test "$lt_os_minor" -eq 5 \
+                      && test "$lt_os_micro" -gt 24; }; }; }; then
+               lt_cv_sys_argz_works=yes
+             fi
+           fi
+           ;; #(
+         *) lt_cv_sys_argz_works=yes ;;
+         esac]])
      AS_IF([test $lt_cv_sys_argz_works = yes],
         [AC_DEFINE([HAVE_WORKING_ARGZ], [1],
                    [This value is set to 1 to indicate that the system argz facility works])],
diff --git a/m4/assert.m4 b/m4/assert.m4
index fb90cb3655..41fbda7f0d 100644
--- a/m4/assert.m4
+++ b/m4/assert.m4
@@ -15,7 +15,7 @@ AC_DEFUN([gl_ASSERT],
     [AS_HELP_STRING([--disable-assert], [turn off assertions])],
     [AS_IF([test "x$enableval" = xno],
       [AC_DEFINE([NDEBUG], [1],
-	[Define to 1 if assertions should be disabled.])],
+        [Define to 1 if assertions should be disabled.])],
       [test "x$enableval" != xyes],
       [AC_MSG_WARN([invalid argument supplied to --enable-assert])
       enable_assert=yes])],
diff --git a/m4/c-stack.m4 b/m4/c-stack.m4
index 2a89696a9c..1272dadb74 100644
--- a/m4/c-stack.m4
+++ b/m4/c-stack.m4
@@ -116,9 +116,9 @@ AC_DEFUN([AC_SYS_XSI_STACK_OVERFLOW_HEURISTIC],
               return c_stack_action () || recurse (0);
             }
            ]])],
-	[ac_cv_sys_stack_overflow_works=yes],
-	[ac_cv_sys_stack_overflow_works=no],
-	[ac_cv_sys_stack_overflow_works=cross-compiling])])
+        [ac_cv_sys_stack_overflow_works=yes],
+        [ac_cv_sys_stack_overflow_works=no],
+        [ac_cv_sys_stack_overflow_works=cross-compiling])])
 
   if test $ac_cv_sys_stack_overflow_works = yes; then
    AC_DEFINE([HAVE_STACK_OVERFLOW_HANDLING], [1],
@@ -132,7 +132,7 @@ AC_DEFUN([AC_SYS_XSI_STACK_OVERFLOW_HEURISTIC],
     AC_CACHE_CHECK([for correct stack_t interpretation],
       [gl_cv_sigaltstack_low_base], [
       AC_RUN_IFELSE([
-	AC_LANG_SOURCE([[
+        AC_LANG_SOURCE([[
 #include <stdlib.h>
 #include <signal.h>
 #if HAVE_SYS_SIGNAL_H
@@ -183,9 +183,9 @@ int main ()
       [gl_cv_sigaltstack_low_base=cross-compiling])])
    if test "$gl_cv_sigaltstack_low_base" = no; then
       AC_DEFINE([SIGALTSTACK_SS_REVERSED], [1],
-	[Define if sigaltstack() interprets the stack_t.ss_sp field
-	 incorrectly, as the highest address of the alternate stack range
-	 rather than as the lowest address.])
+        [Define if sigaltstack() interprets the stack_t.ss_sp field
+         incorrectly, as the highest address of the alternate stack range
+         rather than as the lowest address.])
     fi
 
    AC_CACHE_CHECK([for precise C stack overflow detection],
@@ -302,19 +302,19 @@ int main ()
               return c_stack_action () || recurse (0);
             }
            ]])],
-	[ac_cv_sys_xsi_stack_overflow_heuristic=yes],
-	[ac_cv_sys_xsi_stack_overflow_heuristic=no],
-	[ac_cv_sys_xsi_stack_overflow_heuristic=cross-compiling])])
+        [ac_cv_sys_xsi_stack_overflow_heuristic=yes],
+        [ac_cv_sys_xsi_stack_overflow_heuristic=no],
+        [ac_cv_sys_xsi_stack_overflow_heuristic=cross-compiling])])
 
    if test $ac_cv_sys_xsi_stack_overflow_heuristic = yes; then
      AC_DEFINE([HAVE_XSI_STACK_OVERFLOW_HEURISTIC], [1],
        [Define to 1 if extending the stack slightly past the limit causes
-	a SIGSEGV, and an alternate stack can be established with sigaltstack,
-	and the signal handler is passed a context that specifies the
-	run time stack.  This behavior is defined by POSIX 1003.1-2001
-	with the X/Open System Interface (XSI) option
-	and is a standardized way to implement a SEGV-based stack
-	overflow detection heuristic.])
+        a SIGSEGV, and an alternate stack can be established with sigaltstack,
+        and the signal handler is passed a context that specifies the
+        run time stack.  This behavior is defined by POSIX 1003.1-2001
+        with the X/Open System Interface (XSI) option
+        and is a standardized way to implement a SEGV-based stack
+        overflow detection heuristic.])
    fi
   fi])
 
diff --git a/m4/c-strtod.m4 b/m4/c-strtod.m4
index ba954354f8..440b0d662a 100644
--- a/m4/c-strtod.m4
+++ b/m4/c-strtod.m4
@@ -14,17 +14,17 @@ AC_DEFUN([gl_C99_STRTOLD],
     [AC_LINK_IFELSE(
        [AC_LANG_PROGRAM(
           [[/* On HP-UX before 11.23, strtold returns a struct instead of
-		long double.  Reject implementations like that, by requiring
-		compatibility with the C99 prototype.  */
-	     #include <stdlib.h>
-	     static long double (*p) (char const *, char **) = strtold;
-	     static long double
-	     test (char const *nptr, char **endptr)
-	     {
-	       long double r;
-	       r = strtold (nptr, endptr);
-	       return r;
-	     }]],
+                long double.  Reject implementations like that, by requiring
+                compatibility with the C99 prototype.  */
+             #include <stdlib.h>
+             static long double (*p) (char const *, char **) = strtold;
+             static long double
+             test (char const *nptr, char **endptr)
+             {
+               long double r;
+               r = strtold (nptr, endptr);
+               return r;
+             }]],
            [[return test ("1.0", NULL) != 1 || p ("1.0", NULL) != 1;]])],
        [gl_cv_func_c99_strtold=yes],
        [gl_cv_func_c99_strtold=no])])
diff --git a/m4/calloc.m4 b/m4/calloc.m4
index b0637b44ad..3bb8991261 100644
--- a/m4/calloc.m4
+++ b/m4/calloc.m4
@@ -19,10 +19,10 @@ AC_DEFUN([_AC_FUNC_CALLOC_IF],
 [AC_REQUIRE([AC_TYPE_SIZE_T])dnl
 AC_CACHE_CHECK([for GNU libc compatible calloc], [ac_cv_func_calloc_0_nonnull],
 [AC_RUN_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT],
-		  [[exit (!calloc (0, 0) || calloc ((size_t) -1 / 8 + 1, 8));]])],
-	       [ac_cv_func_calloc_0_nonnull=yes],
-	       [ac_cv_func_calloc_0_nonnull=no],
-	       [ac_cv_func_calloc_0_nonnull=no])])
+                  [[exit (!calloc (0, 0) || calloc ((size_t) -1 / 8 + 1, 8));]])],
+               [ac_cv_func_calloc_0_nonnull=yes],
+               [ac_cv_func_calloc_0_nonnull=no],
+               [ac_cv_func_calloc_0_nonnull=no])])
 AS_IF([test $ac_cv_func_calloc_0_nonnull = yes], [$1], [$2])
 ])# AC_FUNC_CALLOC
 
@@ -34,8 +34,8 @@ AS_IF([test $ac_cv_func_calloc_0_nonnull = yes], [$1], [$2])
 AC_DEFUN([AC_FUNC_CALLOC],
 [_AC_FUNC_CALLOC_IF(
   [AC_DEFINE([HAVE_CALLOC], [1],
-	     [Define to 1 if your system has a GNU libc compatible `calloc'
-	      function, and to 0 otherwise.])],
+             [Define to 1 if your system has a GNU libc compatible `calloc'
+              function, and to 0 otherwise.])],
   [AC_DEFINE([HAVE_CALLOC], [0])
    AC_LIBOBJ([calloc])
    AC_DEFINE([calloc], [rpl_calloc],
diff --git a/m4/chown.m4 b/m4/chown.m4
index 0dced4bce0..8c3ae55730 100644
--- a/m4/chown.m4
+++ b/m4/chown.m4
@@ -110,24 +110,24 @@ AC_DEFUN_ONCE([gl_FUNC_CHOWN_FOLLOWS_SYMLINK],
 #include <stdlib.h>
 #include <errno.h>
 
-	int
-	main ()
-	{
-	  char const *dangling_symlink = "conftest.dangle";
+        int
+        main ()
+        {
+          char const *dangling_symlink = "conftest.dangle";
 
-	  unlink (dangling_symlink);
-	  if (symlink ("conftest.no-such", dangling_symlink))
-	    abort ();
+          unlink (dangling_symlink);
+          if (symlink ("conftest.no-such", dangling_symlink))
+            abort ();
 
-	  /* Exit successfully on a conforming system,
-	     i.e., where chown must fail with ENOENT.  */
-	  exit ( ! (chown (dangling_symlink, getuid (), getgid ()) != 0
-		    && errno == ENOENT));
-	}
-	]])],
-	[gl_cv_func_chown_follows_symlink=yes],
-	[gl_cv_func_chown_follows_symlink=no],
-	[gl_cv_func_chown_follows_symlink=yes]
+          /* Exit successfully on a conforming system,
+             i.e., where chown must fail with ENOENT.  */
+          exit ( ! (chown (dangling_symlink, getuid (), getgid ()) != 0
+                    && errno == ENOENT));
+        }
+        ]])],
+        [gl_cv_func_chown_follows_symlink=yes],
+        [gl_cv_func_chown_follows_symlink=no],
+        [gl_cv_func_chown_follows_symlink=yes]
       )
     ]
   )
diff --git a/m4/d-ino.m4 b/m4/d-ino.m4
index 9bab8f1494..e4ea6ea33c 100644
--- a/m4/d-ino.m4
+++ b/m4/d-ino.m4
@@ -14,25 +14,25 @@ dnl
 
 AC_DEFUN([gl_CHECK_TYPE_STRUCT_DIRENT_D_INO],
   [AC_CACHE_CHECK([for d_ino member in directory struct],
-		  gl_cv_struct_dirent_d_ino,
+                  gl_cv_struct_dirent_d_ino,
      [AC_RUN_IFELSE(
-	[AC_LANG_PROGRAM(
-	   [[#include <sys/types.h>
-	     #include <sys/stat.h>
-	     #include <dirent.h>
-	   ]],
-	   [[DIR *dp = opendir (".");
-	     struct dirent *e;
-	     struct stat st;
-	     if (! dp)
-	       return 1;
-	     e = readdir (dp);
-	     return ! (e
-		       && stat (e->d_name, &st) == 0
-		       && e->d_ino == st.st_ino);]])],
-	    [gl_cv_struct_dirent_d_ino=yes],
-	    [gl_cv_struct_dirent_d_ino=no],
-	    [gl_cv_struct_dirent_d_ino=no])])
+        [AC_LANG_PROGRAM(
+           [[#include <sys/types.h>
+             #include <sys/stat.h>
+             #include <dirent.h>
+           ]],
+           [[DIR *dp = opendir (".");
+             struct dirent *e;
+             struct stat st;
+             if (! dp)
+               return 1;
+             e = readdir (dp);
+             return ! (e
+                       && stat (e->d_name, &st) == 0
+                       && e->d_ino == st.st_ino);]])],
+            [gl_cv_struct_dirent_d_ino=yes],
+            [gl_cv_struct_dirent_d_ino=no],
+            [gl_cv_struct_dirent_d_ino=no])])
    if test $gl_cv_struct_dirent_d_ino = yes; then
      AC_DEFINE([D_INO_IN_DIRENT], [1],
        [Define if struct dirent has a member d_ino that actually works.])
diff --git a/m4/d-type.m4 b/m4/d-type.m4
index 97e8852de3..bceeb952ef 100644
--- a/m4/d-type.m4
+++ b/m4/d-type.m4
@@ -13,12 +13,12 @@ dnl
 
 AC_DEFUN([gl_CHECK_TYPE_STRUCT_DIRENT_D_TYPE],
   [AC_CACHE_CHECK([for d_type member in directory struct],
-		  gl_cv_struct_dirent_d_type,
+                  gl_cv_struct_dirent_d_type,
      [AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 #include <sys/types.h>
 #include <dirent.h>
-	 ]],
-	 [[struct dirent dp; dp.d_type = 0;]])],
+         ]],
+         [[struct dirent dp; dp.d_type = 0;]])],
        [gl_cv_struct_dirent_d_type=yes],
        [gl_cv_struct_dirent_d_type=no])
      ]
diff --git a/m4/dirfd.m4 b/m4/dirfd.m4
index 02ddc9f787..fe0975df47 100644
--- a/m4/dirfd.m4
+++ b/m4/dirfd.m4
@@ -46,34 +46,34 @@ AC_DEFUN([gl_FUNC_DIRFD],
       = no,no,no; then
     AC_REPLACE_FUNCS([dirfd])
     AC_CACHE_CHECK(
-	      [how to get the file descriptor associated with an open DIR*],
-		   gl_cv_sys_dir_fd_member_name,
+              [how to get the file descriptor associated with an open DIR*],
+                   gl_cv_sys_dir_fd_member_name,
       [
-	dirfd_save_CFLAGS=$CFLAGS
-	for ac_expr in d_fd dd_fd; do
+        dirfd_save_CFLAGS=$CFLAGS
+        for ac_expr in d_fd dd_fd; do
 
-	  CFLAGS="$CFLAGS -DDIR_FD_MEMBER_NAME=$ac_expr"
-	  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-	     #include <sys/types.h>
-	     #include <dirent.h>]],
-	    [[DIR *dir_p = opendir("."); (void) dir_p->DIR_FD_MEMBER_NAME;]])],
-	    [dir_fd_found=yes]
-	  )
-	  CFLAGS=$dirfd_save_CFLAGS
-	  test "$dir_fd_found" = yes && break
-	done
-	test "$dir_fd_found" = yes || ac_expr=no_such_member
+          CFLAGS="$CFLAGS -DDIR_FD_MEMBER_NAME=$ac_expr"
+          AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+             #include <sys/types.h>
+             #include <dirent.h>]],
+            [[DIR *dir_p = opendir("."); (void) dir_p->DIR_FD_MEMBER_NAME;]])],
+            [dir_fd_found=yes]
+          )
+          CFLAGS=$dirfd_save_CFLAGS
+          test "$dir_fd_found" = yes && break
+        done
+        test "$dir_fd_found" = yes || ac_expr=no_such_member
 
-	gl_cv_sys_dir_fd_member_name=$ac_expr
+        gl_cv_sys_dir_fd_member_name=$ac_expr
       ]
     )
     if test $gl_cv_sys_dir_fd_member_name != no_such_member; then
       AC_DEFINE_UNQUOTED([DIR_FD_MEMBER_NAME],
-	$gl_cv_sys_dir_fd_member_name,
-	[the name of the file descriptor member of DIR])
+        $gl_cv_sys_dir_fd_member_name,
+        [the name of the file descriptor member of DIR])
     fi
     AH_VERBATIM(DIR_TO_FD,
-		[#ifdef DIR_FD_MEMBER_NAME
+                [#ifdef DIR_FD_MEMBER_NAME
 # define DIR_TO_FD(Dir_p) ((Dir_p)->DIR_FD_MEMBER_NAME)
 #else
 # define DIR_TO_FD(Dir_p) -1
diff --git a/m4/dos.m4 b/m4/dos.m4
index 231ddc0cf1..5c3593c27a 100644
--- a/m4/dos.m4
+++ b/m4/dos.m4
@@ -14,31 +14,31 @@ AC_DEFUN([gl_AC_DOS],
   [
     AC_CACHE_CHECK([whether system is Windows or MSDOS], [ac_cv_win_or_dos],
       [
-	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[
+        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[
 #if !defined _WIN32 && !defined __WIN32__ && !defined __MSDOS__ && !defined __CYGWIN__
 neither MSDOS nor Windows
 #endif]])],
-	[ac_cv_win_or_dos=yes],
-	[ac_cv_win_or_dos=no])
+        [ac_cv_win_or_dos=yes],
+        [ac_cv_win_or_dos=no])
       ])
 
     if test x"$ac_cv_win_or_dos" = xyes; then
       ac_fs_accepts_drive_letter_prefix=1
       ac_fs_backslash_is_file_name_separator=1
       AC_CACHE_CHECK([whether drive letter can start relative path],
-		     [ac_cv_drive_letter_can_be_relative],
-	[
-	  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[
+                     [ac_cv_drive_letter_can_be_relative],
+        [
+          AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[
 #if defined __CYGWIN__
 drive letters are always absolute
 #endif]])],
-	  [ac_cv_drive_letter_can_be_relative=yes],
-	  [ac_cv_drive_letter_can_be_relative=no])
-	])
+          [ac_cv_drive_letter_can_be_relative=yes],
+          [ac_cv_drive_letter_can_be_relative=no])
+        ])
       if test x"$ac_cv_drive_letter_can_be_relative" = xyes; then
-	ac_fs_drive_letter_can_be_relative=1
+        ac_fs_drive_letter_can_be_relative=1
       else
-	ac_fs_drive_letter_can_be_relative=0
+        ac_fs_drive_letter_can_be_relative=0
       fi
     else
       ac_fs_accepts_drive_letter_prefix=0
diff --git a/m4/double-slash-root.m4 b/m4/double-slash-root.m4
index 8c6841bc83..b98259415c 100644
--- a/m4/double-slash-root.m4
+++ b/m4/double-slash-root.m4
@@ -9,27 +9,27 @@ AC_DEFUN([gl_DOUBLE_SLASH_ROOT],
   AC_REQUIRE([AC_CANONICAL_HOST])
   AC_CACHE_CHECK([whether // is distinct from /], [gl_cv_double_slash_root],
     [ if test x"$cross_compiling" = xyes ; then
-	# When cross-compiling, there is no way to tell whether // is special
-	# short of a list of hosts.  However, the only known hosts to date
-	# that have a distinct // are Apollo DomainOS (too old to port to),
-	# Cygwin, and z/OS.  If anyone knows of another system for which // has
-	# special semantics and is distinct from /, please report it to
-	# <bug-gnulib@gnu.org>.
-	case $host in
-	  *-cygwin | i370-ibm-openedition)
-	    gl_cv_double_slash_root=yes ;;
-	  *)
-	    # Be optimistic and assume that / and // are the same when we
-	    # don't know.
-	    gl_cv_double_slash_root='unknown, assuming no' ;;
-	esac
+        # When cross-compiling, there is no way to tell whether // is special
+        # short of a list of hosts.  However, the only known hosts to date
+        # that have a distinct // are Apollo DomainOS (too old to port to),
+        # Cygwin, and z/OS.  If anyone knows of another system for which // has
+        # special semantics and is distinct from /, please report it to
+        # <bug-gnulib@gnu.org>.
+        case $host in
+          *-cygwin | i370-ibm-openedition)
+            gl_cv_double_slash_root=yes ;;
+          *)
+            # Be optimistic and assume that / and // are the same when we
+            # don't know.
+            gl_cv_double_slash_root='unknown, assuming no' ;;
+        esac
       else
-	set x `ls -di / // 2>/dev/null`
-	if test "$[2]" = "$[4]" && wc //dev/null >/dev/null 2>&1; then
-	  gl_cv_double_slash_root=no
-	else
-	  gl_cv_double_slash_root=yes
-	fi
+        set x `ls -di / // 2>/dev/null`
+        if test "$[2]" = "$[4]" && wc //dev/null >/dev/null 2>&1; then
+          gl_cv_double_slash_root=no
+        else
+          gl_cv_double_slash_root=yes
+        fi
       fi])
   if test "$gl_cv_double_slash_root" = yes; then
     AC_DEFINE([DOUBLE_SLASH_IS_DISTINCT_ROOT], [1],
diff --git a/m4/dup2.m4 b/m4/dup2.m4
index 26a6f60e34..73a32092dd 100644
--- a/m4/dup2.m4
+++ b/m4/dup2.m4
@@ -28,19 +28,19 @@ AC_DEFUN([gl_FUNC_DUP2],
             return 0;
            ])
         ],
-	[gl_cv_func_dup2_works=yes], [gl_cv_func_dup2_works=no],
-	[case "$host_os" in
-	   mingw*) # on this platform, dup2 always returns 0 for success
-	     gl_cv_func_dup2_works=no;;
-	   cygwin*) # on cygwin 1.5.x, dup2(1,1) returns 0
-	     gl_cv_func_dup2_works=no;;
-	   linux*) # On linux between 2008-07-27 and 2009-05-11, dup2 of a
-	           # closed fd may yield -EBADF instead of -1 / errno=EBADF.
-	     gl_cv_func_dup2_works=no;;
+        [gl_cv_func_dup2_works=yes], [gl_cv_func_dup2_works=no],
+        [case "$host_os" in
+           mingw*) # on this platform, dup2 always returns 0 for success
+             gl_cv_func_dup2_works=no;;
+           cygwin*) # on cygwin 1.5.x, dup2(1,1) returns 0
+             gl_cv_func_dup2_works=no;;
+           linux*) # On linux between 2008-07-27 and 2009-05-11, dup2 of a
+                   # closed fd may yield -EBADF instead of -1 / errno=EBADF.
+             gl_cv_func_dup2_works=no;;
            freebsd*) # on FreeBSD 6.1, dup2(1,1000000) gives EMFILE, not EBADF.
-	     gl_cv_func_dup2_works=no;;
-	   *) gl_cv_func_dup2_works=yes;;
-	 esac])
+             gl_cv_func_dup2_works=no;;
+           *) gl_cv_func_dup2_works=yes;;
+         esac])
       ])
     if test "$gl_cv_func_dup2_works" = no; then
       gl_REPLACE_DUP2
diff --git a/m4/extensions.m4 b/m4/extensions.m4
index ba6d5e190f..99fba9f63b 100644
--- a/m4/extensions.m4
+++ b/m4/extensions.m4
@@ -74,8 +74,8 @@ AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
     [ac_cv_safe_to_define___extensions__],
     [AC_COMPILE_IFELSE(
        [AC_LANG_PROGRAM([[
-#	  define __EXTENSIONS__ 1
-	  ]AC_INCLUDES_DEFAULT])],
+#         define __EXTENSIONS__ 1
+          ]AC_INCLUDES_DEFAULT])],
        [ac_cv_safe_to_define___extensions__=yes],
        [ac_cv_safe_to_define___extensions__=no])])
   test $ac_cv_safe_to_define___extensions__ = yes &&
diff --git a/m4/fcntl_h.m4 b/m4/fcntl_h.m4
index 223fa4830a..40a18034dc 100644
--- a/m4/fcntl_h.m4
+++ b/m4/fcntl_h.m4
@@ -26,53 +26,53 @@ AC_DEFUN([gl_FCNTL_O_FLAGS],
   AC_CACHE_CHECK([for working fcntl.h], [gl_cv_header_working_fcntl_h],
     [AC_RUN_IFELSE(
        [AC_LANG_PROGRAM(
-	  [[#include <sys/types.h>
-	   #include <sys/stat.h>
-	   #include <unistd.h>
-	   #include <fcntl.h>
-	   #ifndef O_NOATIME
-	    #define O_NOATIME 0
-	   #endif
-	   #ifndef O_NOFOLLOW
-	    #define O_NOFOLLOW 0
-	   #endif
-	   static int const constants[] =
-	    {
-	      O_CREAT, O_EXCL, O_NOCTTY, O_TRUNC, O_APPEND,
-	      O_NONBLOCK, O_SYNC, O_ACCMODE, O_RDONLY, O_RDWR, O_WRONLY
-	    };
-	  ]],
-	  [[
-	    int status = !constants;
-	    {
-	      static char const sym[] = "conftest.sym";
-	      if (symlink (".", sym) != 0
-		  || close (open (sym, O_RDONLY | O_NOFOLLOW)) == 0)
-		status |= 32;
-	      unlink (sym);
-	    }
-	    {
-	      static char const file[] = "confdefs.h";
-	      int fd = open (file, O_RDONLY | O_NOATIME);
-	      char c;
-	      struct stat st0, st1;
-	      if (fd < 0
-		  || fstat (fd, &st0) != 0
-		  || sleep (1) != 0
-		  || read (fd, &c, 1) != 1
-		  || close (fd) != 0
-		  || stat (file, &st1) != 0
-		  || st0.st_atime != st1.st_atime)
-		status |= 64;
-	    }
-	    return status;]])],
+          [[#include <sys/types.h>
+           #include <sys/stat.h>
+           #include <unistd.h>
+           #include <fcntl.h>
+           #ifndef O_NOATIME
+            #define O_NOATIME 0
+           #endif
+           #ifndef O_NOFOLLOW
+            #define O_NOFOLLOW 0
+           #endif
+           static int const constants[] =
+            {
+              O_CREAT, O_EXCL, O_NOCTTY, O_TRUNC, O_APPEND,
+              O_NONBLOCK, O_SYNC, O_ACCMODE, O_RDONLY, O_RDWR, O_WRONLY
+            };
+          ]],
+          [[
+            int status = !constants;
+            {
+              static char const sym[] = "conftest.sym";
+              if (symlink (".", sym) != 0
+                  || close (open (sym, O_RDONLY | O_NOFOLLOW)) == 0)
+                status |= 32;
+              unlink (sym);
+            }
+            {
+              static char const file[] = "confdefs.h";
+              int fd = open (file, O_RDONLY | O_NOATIME);
+              char c;
+              struct stat st0, st1;
+              if (fd < 0
+                  || fstat (fd, &st0) != 0
+                  || sleep (1) != 0
+                  || read (fd, &c, 1) != 1
+                  || close (fd) != 0
+                  || stat (file, &st1) != 0
+                  || st0.st_atime != st1.st_atime)
+                status |= 64;
+            }
+            return status;]])],
        [gl_cv_header_working_fcntl_h=yes],
        [case $? in #(
-	32) gl_cv_header_working_fcntl_h='no (bad O_NOFOLLOW)';; #(
-	64) gl_cv_header_working_fcntl_h='no (bad O_NOATIME)';; #(
-	96) gl_cv_header_working_fcntl_h='no (bad O_NOATIME, O_NOFOLLOW)';; #(
-	 *) gl_cv_header_working_fcntl_h='no';;
-	esac],
+        32) gl_cv_header_working_fcntl_h='no (bad O_NOFOLLOW)';; #(
+        64) gl_cv_header_working_fcntl_h='no (bad O_NOATIME)';; #(
+        96) gl_cv_header_working_fcntl_h='no (bad O_NOATIME, O_NOFOLLOW)';; #(
+         *) gl_cv_header_working_fcntl_h='no';;
+        esac],
        [gl_cv_header_working_fcntl_h=cross-compiling])])
 
   case $gl_cv_header_working_fcntl_h in #(
diff --git a/m4/fdopendir.m4 b/m4/fdopendir.m4
index 0ffb7fbbeb..0ae80b382a 100644
--- a/m4/fdopendir.m4
+++ b/m4/fdopendir.m4
@@ -26,9 +26,9 @@ AC_DEFUN([gl_FUNC_FDOPENDIR],
 ]], [int fd = open ("conftest.h", O_RDONLY);
      if (fd < 0) return 2;
      return !!fdopendir (fd);])],
-	 [gl_cv_func_fdopendir_works=yes],
-	 [gl_cv_func_fdopendir_works=no],
-	 [gl_cv_func_fdopendir_works="guessing no"])])
+         [gl_cv_func_fdopendir_works=yes],
+         [gl_cv_func_fdopendir_works=no],
+         [gl_cv_func_fdopendir_works="guessing no"])])
     if test "$gl_cv_func_fdopendir_works" != yes; then
       REPLACE_FDOPENDIR=1
       gl_REPLACE_DIRENT_H
diff --git a/m4/fflush.m4 b/m4/fflush.m4
index da30e1fe67..aae51046b9 100644
--- a/m4/fflush.m4
+++ b/m4/fflush.m4
@@ -20,40 +20,40 @@ AC_DEFUN([gl_FUNC_FFLUSH],
 #include <stdio.h>
 #include <unistd.h>
        ]], [[FILE *f = fopen ("conftest.txt", "r");
-	 char buffer[10];
-	 int fd;
-	 int c;
-	 if (f == NULL)
-	   return 1;
-	 fd = fileno (f);
-	 if (fd < 0 || fread (buffer, 1, 5, f) != 5)
-	   return 2;
-	 /* For deterministic results, ensure f read a bigger buffer.  */
-	 if (lseek (fd, 0, SEEK_CUR) == 5)
-	   return 3;
-	 /* POSIX requires fflush-fseek to set file offset of fd.  This fails
-	    on BSD systems and on mingw.  */
-	 if (fflush (f) != 0 || fseek (f, 0, SEEK_CUR) != 0)
-	   return 4;
-	 if (lseek (fd, 0, SEEK_CUR) != 5)
-	   return 5;
-	 /* Verify behaviour of fflush after ungetc. See
-	    <http://www.opengroup.org/austin/aardvark/latest/xshbug3.txt>  */
-	 /* Verify behaviour of fflush after a backup ungetc.  This fails on
-	    mingw.  */
-	 c = fgetc (f);
-	 ungetc (c, f);
-	 fflush (f);
-	 if (fgetc (f) != c)
-	   return 6;
-	 /* Verify behaviour of fflush after a non-backup ungetc.  This fails
-	    on glibc 2.8 and on BSD systems.  */
-	 c = fgetc (f);
-	 ungetc ('@', f);
-	 fflush (f);
-	 if (fgetc (f) != c)
-	   return 7;
-	 return 0;
+         char buffer[10];
+         int fd;
+         int c;
+         if (f == NULL)
+           return 1;
+         fd = fileno (f);
+         if (fd < 0 || fread (buffer, 1, 5, f) != 5)
+           return 2;
+         /* For deterministic results, ensure f read a bigger buffer.  */
+         if (lseek (fd, 0, SEEK_CUR) == 5)
+           return 3;
+         /* POSIX requires fflush-fseek to set file offset of fd.  This fails
+            on BSD systems and on mingw.  */
+         if (fflush (f) != 0 || fseek (f, 0, SEEK_CUR) != 0)
+           return 4;
+         if (lseek (fd, 0, SEEK_CUR) != 5)
+           return 5;
+         /* Verify behaviour of fflush after ungetc. See
+            <http://www.opengroup.org/austin/aardvark/latest/xshbug3.txt>  */
+         /* Verify behaviour of fflush after a backup ungetc.  This fails on
+            mingw.  */
+         c = fgetc (f);
+         ungetc (c, f);
+         fflush (f);
+         if (fgetc (f) != c)
+           return 6;
+         /* Verify behaviour of fflush after a non-backup ungetc.  This fails
+            on glibc 2.8 and on BSD systems.  */
+         c = fgetc (f);
+         ungetc ('@', f);
+         fflush (f);
+         if (fgetc (f) != c)
+           return 7;
+         return 0;
        ]])], [gl_cv_func_fflush_stdin=yes], [gl_cv_func_fflush_stdin=no],
      [dnl Pessimistically assume fflush is broken.
       gl_cv_func_fflush_stdin=no])
diff --git a/m4/flexmember.m4 b/m4/flexmember.m4
index 271889b20f..c2314f4e4e 100644
--- a/m4/flexmember.m4
+++ b/m4/flexmember.m4
@@ -14,15 +14,15 @@ AC_DEFUN([AC_C_FLEXIBLE_ARRAY_MEMBER],
     ac_cv_c_flexmember,
     [AC_COMPILE_IFELSE(
        [AC_LANG_PROGRAM(
-	  [[#include <stdlib.h>
-	    #include <stdio.h>
-	    #include <stddef.h>
-	    struct s { int n; double d[]; };]],
-	  [[int m = getchar ();
-	    struct s *p = malloc (offsetof (struct s, d)
-				  + m * sizeof (double));
-	    p->d[0] = 0.0;
-	    return p->d != (double *) NULL;]])],
+          [[#include <stdlib.h>
+            #include <stdio.h>
+            #include <stddef.h>
+            struct s { int n; double d[]; };]],
+          [[int m = getchar ();
+            struct s *p = malloc (offsetof (struct s, d)
+                                  + m * sizeof (double));
+            p->d[0] = 0.0;
+            return p->d != (double *) NULL;]])],
        [ac_cv_c_flexmember=yes],
        [ac_cv_c_flexmember=no])])
   if test $ac_cv_c_flexmember = yes; then
diff --git a/m4/fpending.m4 b/m4/fpending.m4
index fecf3f3151..4f3cacaa85 100644
--- a/m4/fpending.m4
+++ b/m4/fpending.m4
@@ -26,53 +26,53 @@ AC_DEFUN([gl_FUNC_FPENDING],
   AC_CHECK_DECLS([__fpending], , , $fp_headers)
   if test $ac_cv_func___fpending = no; then
     AC_CACHE_CHECK(
-	      [how to determine the number of pending output bytes on a stream],
-		   ac_cv_sys_pending_output_n_bytes,
+              [how to determine the number of pending output bytes on a stream],
+                   ac_cv_sys_pending_output_n_bytes,
       [
-	for ac_expr in							  \
-									  \
-	    '# glibc2'							  \
-	    'fp->_IO_write_ptr - fp->_IO_write_base'			  \
-									  \
-	    '# traditional Unix'					  \
-	    'fp->_ptr - fp->_base'					  \
-									  \
-	    '# BSD'							  \
-	    'fp->_p - fp->_bf._base'					  \
-									  \
-	    '# SCO, Unixware'						  \
-	    '(fp->__ptr ? fp->__ptr - fp->__base : 0)'			  \
-									  \
-	    '# QNX'							  \
-	    '(fp->_Mode & 0x2000 /*_MWRITE*/ ? fp->_Next - fp->_Buf : 0)' \
-									  \
-	    '# old glibc?'						  \
-	    'fp->__bufp - fp->__buffer'					  \
-									  \
-	    '# old glibc iostream?'					  \
-	    'fp->_pptr - fp->_pbase'					  \
-									  \
-	    '# emx+gcc'							  \
-	    'fp->_ptr - fp->_buffer'					  \
-									  \
-	    '# VMS'							  \
-	    '(*fp)->_ptr - (*fp)->_base'				  \
-									  \
-	    '# e.g., DGUX R4.11; the info is not available'		  \
-	    1								  \
-	    ; do
+        for ac_expr in                                                    \
+                                                                          \
+            '# glibc2'                                                    \
+            'fp->_IO_write_ptr - fp->_IO_write_base'                      \
+                                                                          \
+            '# traditional Unix'                                          \
+            'fp->_ptr - fp->_base'                                        \
+                                                                          \
+            '# BSD'                                                       \
+            'fp->_p - fp->_bf._base'                                      \
+                                                                          \
+            '# SCO, Unixware'                                             \
+            '(fp->__ptr ? fp->__ptr - fp->__base : 0)'                    \
+                                                                          \
+            '# QNX'                                                       \
+            '(fp->_Mode & 0x2000 /*_MWRITE*/ ? fp->_Next - fp->_Buf : 0)' \
+                                                                          \
+            '# old glibc?'                                                \
+            'fp->__bufp - fp->__buffer'                                   \
+                                                                          \
+            '# old glibc iostream?'                                       \
+            'fp->_pptr - fp->_pbase'                                      \
+                                                                          \
+            '# emx+gcc'                                                   \
+            'fp->_ptr - fp->_buffer'                                      \
+                                                                          \
+            '# VMS'                                                       \
+            '(*fp)->_ptr - (*fp)->_base'                                  \
+                                                                          \
+            '# e.g., DGUX R4.11; the info is not available'               \
+            1                                                             \
+            ; do
 
-	  # Skip each embedded comment.
-	  case "$ac_expr" in '#'*) continue;; esac
+          # Skip each embedded comment.
+          case "$ac_expr" in '#'*) continue;; esac
 
-	  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]],
-	    [[FILE *fp = stdin; (void) ($ac_expr);]])],
-	    [fp_done=yes]
-	  )
-	  test "$fp_done" = yes && break
-	done
+          AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]],
+            [[FILE *fp = stdin; (void) ($ac_expr);]])],
+            [fp_done=yes]
+          )
+          test "$fp_done" = yes && break
+        done
 
-	ac_cv_sys_pending_output_n_bytes=$ac_expr
+        ac_cv_sys_pending_output_n_bytes=$ac_expr
       ]
     )
     AC_DEFINE_UNQUOTED([PENDING_OUTPUT_N_BYTES],
diff --git a/m4/fpurge.m4 b/m4/fpurge.m4
index 4dba2ec0be..c245515c02 100644
--- a/m4/fpurge.m4
+++ b/m4/fpurge.m4
@@ -15,21 +15,21 @@ AC_DEFUN([gl_FUNC_FPURGE],
     AC_CACHE_CHECK([whether fpurge works], [gl_cv_func_fpurge_works],
       [AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
 ]], [FILE *f = fopen ("conftest.txt", "w+");
-	if (!f) return 1;
-	if (fputc ('a', f) != 'a') return 2;
-	rewind (f);
-	if (fgetc (f) != 'a') return 3;
-	if (fgetc (f) != EOF) return 4;
-	if (fpurge (f) != 0) return 5;
-	if (putc ('b', f) != 'b') return 6;
-	if (fclose (f) != 0) return 7;
-	if ((f = fopen ("conftest.txt", "r")) == NULL) return 8;
-	if (fgetc (f) != 'a') return 9;
-	if (fgetc (f) != 'b') return 10;
-	if (fgetc (f) != EOF) return 11;
-	if (fclose (f) != 0) return 12;
-	if (remove ("conftest.txt") != 0) return 13;
-	return 0;])],
+        if (!f) return 1;
+        if (fputc ('a', f) != 'a') return 2;
+        rewind (f);
+        if (fgetc (f) != 'a') return 3;
+        if (fgetc (f) != EOF) return 4;
+        if (fpurge (f) != 0) return 5;
+        if (putc ('b', f) != 'b') return 6;
+        if (fclose (f) != 0) return 7;
+        if ((f = fopen ("conftest.txt", "r")) == NULL) return 8;
+        if (fgetc (f) != 'a') return 9;
+        if (fgetc (f) != 'b') return 10;
+        if (fgetc (f) != EOF) return 11;
+        if (fclose (f) != 0) return 12;
+        if (remove ("conftest.txt") != 0) return 13;
+        return 0;])],
       [gl_cv_func_fpurge_works=yes], [gl_cv_func_fpurge_works=no],
       [gl_cv_func_fpurge_works='guessing no'])])
     if test "x$gl_cv_func_fpurge_works" != xyes; then
diff --git a/m4/free.m4 b/m4/free.m4
index 05c3038dfc..ef6022b848 100644
--- a/m4/free.m4
+++ b/m4/free.m4
@@ -20,12 +20,12 @@ AC_DEFUN([gl_FUNC_FREE],
     [gl_cv_func_free],
     [AC_COMPILE_IFELSE(
        [AC_LANG_PROGRAM(
-	  [[@%:@include <unistd.h>]],
-	  [[@%:@if _POSIX_VERSION < 199009L && \
-	        (defined unix || defined _unix || defined _unix_ \
-	         || defined __unix || defined __unix__)
-	      @%:@error "'free (NULL)' is not known to work"
-	    @%:@endif]])],
+          [[@%:@include <unistd.h>]],
+          [[@%:@if _POSIX_VERSION < 199009L && \
+                (defined unix || defined _unix || defined _unix_ \
+                 || defined __unix || defined __unix__)
+              @%:@error "'free (NULL)' is not known to work"
+            @%:@endif]])],
        [gl_cv_func_free=yes],
        [gl_cv_func_free=no])])
 
diff --git a/m4/fseeko.m4 b/m4/fseeko.m4
index a370648e9f..feba6ab8e8 100644
--- a/m4/fseeko.m4
+++ b/m4/fseeko.m4
@@ -17,7 +17,7 @@ AC_DEFUN([gl_FUNC_FSEEKO],
     [
       AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
 ]], [fseeko (stdin, 0, 0);])],
-	[gl_cv_func_fseeko=yes], [gl_cv_func_fseeko=no])
+        [gl_cv_func_fseeko=yes], [gl_cv_func_fseeko=no])
     ])
   if test $gl_cv_func_fseeko = no; then
     HAVE_FSEEKO=0
diff --git a/m4/fsusage.m4 b/m4/fsusage.m4
index ae699dff99..b8b89e4391 100644
--- a/m4/fsusage.m4
+++ b/m4/fsusage.m4
@@ -46,7 +46,7 @@ ac_fsusage_space=no
 if test $ac_fsusage_space = no; then
   # SVR4
   AC_CACHE_CHECK([for statvfs function (SVR4)], [fu_cv_sys_stat_statvfs],
-		 [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
+                 [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
 #if defined __GLIBC__ && defined __linux__
 Do not use statvfs on systems with GNU libc on Linux, because that function
 stats all preceding entries in /proc/mounts, and that makes df hang if even
@@ -60,13 +60,13 @@ a system call.
 #endif
 
 #include <sys/statvfs.h>]],
-				    [[struct statvfs fsd; statvfs (0, &fsd);]])],
-				 [fu_cv_sys_stat_statvfs=yes],
-			         [fu_cv_sys_stat_statvfs=no])])
+                                    [[struct statvfs fsd; statvfs (0, &fsd);]])],
+                                 [fu_cv_sys_stat_statvfs=yes],
+                                 [fu_cv_sys_stat_statvfs=no])])
   if test $fu_cv_sys_stat_statvfs = yes; then
     ac_fsusage_space=yes
     AC_DEFINE([STAT_STATVFS], [1],
-	      [  Define if there is a function named statvfs.  (SVR4)])
+              [  Define if there is a function named statvfs.  (SVR4)])
   fi
 fi
 
@@ -92,7 +92,7 @@ if test $ac_fsusage_space = no; then
   if test $fu_cv_sys_stat_statfs3_osf1 = yes; then
     ac_fsusage_space=yes
     AC_DEFINE([STAT_STATFS3_OSF1], [1],
-	      [   Define if  statfs takes 3 args.  (DEC Alpha running OSF/1)])
+              [   Define if  statfs takes 3 args.  (DEC Alpha running OSF/1)])
   fi
 fi
 
@@ -150,7 +150,7 @@ if test $ac_fsusage_space = no; then
   if test $fu_cv_sys_stat_statfs4 = yes; then
     ac_fsusage_space=yes
     AC_DEFINE([STAT_STATFS4], [1],
-	      [  Define if statfs takes 4 args.  (SVR3, Dynix, Irix, Dolphin)])
+              [  Define if statfs takes 4 args.  (SVR3, Dynix, Irix, Dolphin)])
   fi
 fi
 
diff --git a/m4/ftello.m4 b/m4/ftello.m4
index 51308ef53b..7c39322001 100644
--- a/m4/ftello.m4
+++ b/m4/ftello.m4
@@ -16,7 +16,7 @@ AC_DEFUN([gl_FUNC_FTELLO],
   AC_CACHE_CHECK([for ftello], [gl_cv_func_ftello],
     [
       AC_TRY_LINK([#include <stdio.h>], [ftello (stdin);],
-	[gl_cv_func_ftello=yes], [gl_cv_func_ftello=no])
+        [gl_cv_func_ftello=yes], [gl_cv_func_ftello=no])
     ])
   if test $gl_cv_func_ftello = no; then
     HAVE_FTELLO=0
diff --git a/m4/ftruncate.m4 b/m4/ftruncate.m4
index e43c15f2a5..8d9dabade1 100644
--- a/m4/ftruncate.m4
+++ b/m4/ftruncate.m4
@@ -30,10 +30,10 @@ AC_DEFUN([gl_FUNC_FTRUNCATE],
         # a bug report to inform us about it.
         if test x"$SKIP_FTRUNCATE_CHECK" != xyes; then
           AC_MSG_FAILURE([Your system lacks the ftruncate function.
-	      Please report this, along with the output of "uname -a", to the
-	      bug-coreutils@gnu.org mailing list.  To continue past this point,
-	      rerun configure with SKIP_FTRUNCATE_CHECK=yes.
-	      E.g., ./configure SKIP_FTRUNCATE_CHECK=yes])
+              Please report this, along with the output of "uname -a", to the
+              bug-coreutils@gnu.org mailing list.  To continue past this point,
+              rerun configure with SKIP_FTRUNCATE_CHECK=yes.
+              E.g., ./configure SKIP_FTRUNCATE_CHECK=yes])
         fi
     esac
   fi
diff --git a/m4/gc-random.m4 b/m4/gc-random.m4
index 3bbfdafab1..2ca27a190a 100644
--- a/m4/gc-random.m4
+++ b/m4/gc-random.m4
@@ -39,23 +39,23 @@ AC_DEFUN([gl_GC_RANDOM],
 
   AC_MSG_CHECKING([device with (strong) random data...])
   AC_ARG_ENABLE([random-device],
-	AS_HELP_STRING([--enable-random-device],
-		[device with (strong) randomness (for Nettle)]),
-	NAME_OF_RANDOM_DEVICE=$enableval)
+        AS_HELP_STRING([--enable-random-device],
+                [device with (strong) randomness (for Nettle)]),
+        NAME_OF_RANDOM_DEVICE=$enableval)
   AC_MSG_RESULT([$NAME_OF_RANDOM_DEVICE])
 
   AC_MSG_CHECKING([device with pseudo random data...])
   AC_ARG_ENABLE([pseudo-random-device],
-	AS_HELP_STRING([--enable-pseudo-random-device],
-		[device with pseudo randomness (for Nettle)]),
-	NAME_OF_PSEUDO_RANDOM_DEVICE=$enableval)
+        AS_HELP_STRING([--enable-pseudo-random-device],
+                [device with pseudo randomness (for Nettle)]),
+        NAME_OF_PSEUDO_RANDOM_DEVICE=$enableval)
   AC_MSG_RESULT([$NAME_OF_PSEUDO_RANDOM_DEVICE])
 
   AC_MSG_CHECKING([device with unpredictable data for nonces...])
   AC_ARG_ENABLE([nonce-device],
-	AS_HELP_STRING([--enable-nonce-device],
-		[device with unpredictable nonces (for Nettle)]),
-	NAME_OF_NONCE_DEVICE=$enableval)
+        AS_HELP_STRING([--enable-nonce-device],
+                [device with unpredictable nonces (for Nettle)]),
+        NAME_OF_NONCE_DEVICE=$enableval)
   AC_MSG_RESULT([$NAME_OF_NONCE_DEVICE])
 
   if test "$cross_compiling" != yes; then
@@ -80,7 +80,7 @@ AC_DEFUN([gl_GC_RANDOM],
   AC_DEFINE_UNQUOTED([NAME_OF_RANDOM_DEVICE], ["$NAME_OF_RANDOM_DEVICE"],
                    [defined to the name of the (strong) random device])
   AC_DEFINE_UNQUOTED([NAME_OF_PSEUDO_RANDOM_DEVICE],
-			 "$NAME_OF_PSEUDO_RANDOM_DEVICE",
+                         "$NAME_OF_PSEUDO_RANDOM_DEVICE",
                    [defined to the name of the pseudo random device])
   AC_DEFINE_UNQUOTED([NAME_OF_NONCE_DEVICE], ["$NAME_OF_NONCE_DEVICE"],
                    [defined to the name of the unpredictable nonce device])
diff --git a/m4/getaddrinfo.m4 b/m4/getaddrinfo.m4
index 526dce5ba1..4445072fca 100644
--- a/m4/getaddrinfo.m4
+++ b/m4/getaddrinfo.m4
@@ -39,7 +39,7 @@ AC_DEFUN([gl_GETADDRINFO],
       [gl_cv_func_getaddrinfo=no])])
   if test $gl_cv_func_getaddrinfo = no; then
     AC_CACHE_CHECK([for getaddrinfo in ws2tcpip.h and -lws2_32],
-		   gl_cv_w32_getaddrinfo, [
+                   gl_cv_w32_getaddrinfo, [
       gl_cv_w32_getaddrinfo=no
       am_save_LIBS="$LIBS"
       LIBS="$LIBS -lws2_32"
diff --git a/m4/getcwd-abort-bug.m4 b/m4/getcwd-abort-bug.m4
index 07e2c18cc5..4660460fb1 100644
--- a/m4/getcwd-abort-bug.m4
+++ b/m4/getcwd-abort-bug.m4
@@ -23,7 +23,7 @@ AC_DEFUN([gl_FUNC_GETCWD_ABORT_BUG],
      ac_clean_files="$ac_clean_files confdir-14B---"
      AC_RUN_IFELSE(
        [AC_LANG_SOURCE(
-	  [[
+          [[
 #include <stdlib.h>
 #include <unistd.h>
 #include <limits.h>
@@ -69,14 +69,14 @@ main ()
   initial_cwd_len = strlen (cwd);
   free (cwd);
   desired_depth = ((TARGET_LEN - 1 - initial_cwd_len)
-		   / (1 + strlen (dir_name)));
+                   / (1 + strlen (dir_name)));
   for (d = 0; d < desired_depth; d++)
     {
       if (mkdir (dir_name, S_IRWXU) < 0 || chdir (dir_name) < 0)
-	{
-	  fail = 3; /* Unable to construct deep hierarchy.  */
-	  break;
-	}
+        {
+          fail = 3; /* Unable to construct deep hierarchy.  */
+          break;
+        }
     }
 
   /* If libc has the bug in question, this invocation of getcwd
@@ -91,7 +91,7 @@ main ()
   while (0 < d--)
     {
       if (chdir ("..") < 0)
-	break;
+        break;
       rmdir (dir_name);
     }
 
diff --git a/m4/getcwd-path-max.m4 b/m4/getcwd-path-max.m4
index 14784999d4..b2be01cb4c 100644
--- a/m4/getcwd-path-max.m4
+++ b/m4/getcwd-path-max.m4
@@ -23,7 +23,7 @@ AC_DEFUN([gl_FUNC_GETCWD_PATH_MAX],
      ac_clean_files="$ac_clean_files confdir3"
      AC_RUN_IFELSE(
        [AC_LANG_SOURCE(
-	  [[
+          [[
 #include <errno.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -77,7 +77,7 @@ main ()
   exit (0);
 #else
   char buf[PATH_MAX * (DIR_NAME_SIZE / DOTDOTSLASH_LEN + 1)
-	   + DIR_NAME_SIZE + BUF_SLOP];
+           + DIR_NAME_SIZE + BUF_SLOP];
   char *cwd = getcwd (buf, PATH_MAX);
   size_t initial_cwd_len;
   size_t cwd_len;
@@ -96,58 +96,58 @@ main ()
 
       cwd_len += DIR_NAME_SIZE;
       /* If mkdir or chdir fails, it could be that this system cannot create
-	 any file with an absolute name longer than PATH_MAX, such as cygwin.
-	 If so, leave fail as 0, because the current working directory can't
-	 be too long for getcwd if it can't even be created.  For other
-	 errors, be pessimistic and consider that as a failure, too.  */
+         any file with an absolute name longer than PATH_MAX, such as cygwin.
+         If so, leave fail as 0, because the current working directory can't
+         be too long for getcwd if it can't even be created.  For other
+         errors, be pessimistic and consider that as a failure, too.  */
       if (mkdir (DIR_NAME, S_IRWXU) < 0 || chdir (DIR_NAME) < 0)
-	{
-	  if (! (errno == ERANGE || is_ENAMETOOLONG (errno)))
-	    fail = 2;
-	  break;
-	}
+        {
+          if (! (errno == ERANGE || is_ENAMETOOLONG (errno)))
+            fail = 2;
+          break;
+        }
 
       if (PATH_MAX <= cwd_len && cwd_len < PATH_MAX + DIR_NAME_SIZE)
-	{
-	  c = getcwd (buf, PATH_MAX);
-	  if (!c && errno == ENOENT)
-	    {
-	      fail = 1;
-	      break;
-	    }
-	  if (c || ! (errno == ERANGE || is_ENAMETOOLONG (errno)))
-	    {
-	      fail = 2;
-	      break;
-	    }
-	}
+        {
+          c = getcwd (buf, PATH_MAX);
+          if (!c && errno == ENOENT)
+            {
+              fail = 1;
+              break;
+            }
+          if (c || ! (errno == ERANGE || is_ENAMETOOLONG (errno)))
+            {
+              fail = 2;
+              break;
+            }
+        }
 
       if (dotdot_max <= cwd_len - initial_cwd_len)
-	{
-	  if (dotdot_max + DIR_NAME_SIZE < cwd_len - initial_cwd_len)
-	    break;
-	  c = getcwd (buf, cwd_len + 1);
-	  if (!c)
-	    {
-	      if (! (errno == ERANGE || errno == ENOENT
-		     || is_ENAMETOOLONG (errno)))
-		{
-		  fail = 2;
-		  break;
-		}
-	      if (AT_FDCWD || errno == ERANGE || errno == ENOENT)
-		{
-		  fail = 1;
-		  break;
-		}
-	    }
-	}
+        {
+          if (dotdot_max + DIR_NAME_SIZE < cwd_len - initial_cwd_len)
+            break;
+          c = getcwd (buf, cwd_len + 1);
+          if (!c)
+            {
+              if (! (errno == ERANGE || errno == ENOENT
+                     || is_ENAMETOOLONG (errno)))
+                {
+                  fail = 2;
+                  break;
+                }
+              if (AT_FDCWD || errno == ERANGE || errno == ENOENT)
+                {
+                  fail = 1;
+                  break;
+                }
+            }
+        }
 
       if (c && strlen (c) != cwd_len)
-	{
-	  fail = 2;
-	  break;
-	}
+        {
+          fail = 2;
+          break;
+        }
       ++n_chdirs;
     }
 
@@ -161,10 +161,10 @@ main ()
     rmdir (DIR_NAME);
     for (i = 0; i <= n_chdirs; i++)
       {
-	if (chdir ("..") < 0)
-	  break;
-	if (rmdir (DIR_NAME) != 0)
-	  break;
+        if (chdir ("..") < 0)
+          break;
+        if (rmdir (DIR_NAME) != 0)
+          break;
       }
   }
 
diff --git a/m4/getcwd.m4 b/m4/getcwd.m4
index 4b8c4c6ce1..abbb0dc1c0 100644
--- a/m4/getcwd.m4
+++ b/m4/getcwd.m4
@@ -14,26 +14,26 @@ AC_DEFUN([gl_FUNC_GETCWD_NULL],
    AC_CACHE_CHECK([whether getcwd (NULL, 0) allocates memory for result],
      [gl_cv_func_getcwd_null],
      [AC_RUN_IFELSE([AC_LANG_PROGRAM([[
-#	 include <unistd.h>
-#	 ifndef getcwd
-	 char *getcwd ();
-#	 endif
+#        include <unistd.h>
+#        ifndef getcwd
+         char *getcwd ();
+#        endif
 ]], [[
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
 /* mingw cwd does not start with '/', but getcwd does allocate.  */
 #else
-	   if (chdir ("/") != 0)
-	     return 1;
-	   else
-	     {
-	       char *f = getcwd (NULL, 0);
-	       return ! (f && f[0] == '/' && !f[1]);
-	     }
+           if (chdir ("/") != 0)
+             return 1;
+           else
+             {
+               char *f = getcwd (NULL, 0);
+               return ! (f && f[0] == '/' && !f[1]);
+             }
 #endif
-	 ]])],
-	[gl_cv_func_getcwd_null=yes],
-	[gl_cv_func_getcwd_null=no],
-	[[
+         ]])],
+        [gl_cv_func_getcwd_null=yes],
+        [gl_cv_func_getcwd_null=no],
+        [[
        case "$host_os" in
                                # Guess yes on glibc systems.
          *-gnu*)               gl_cv_func_getcwd_null="guessing yes";;
@@ -44,7 +44,7 @@ AC_DEFUN([gl_FUNC_GETCWD_NULL],
                                # If we don't know, assume the worst.
          *)                    gl_cv_func_getcwd_null="guessing no";;
        esac
-	]])])
+        ]])])
 ])
 
 AC_DEFUN([gl_FUNC_GETCWD],
diff --git a/m4/gethrxtime.m4 b/m4/gethrxtime.m4
index ef1758183c..33eaec5e48 100644
--- a/m4/gethrxtime.m4
+++ b/m4/gethrxtime.m4
@@ -31,7 +31,7 @@ AC_DEFUN([gl_ARITHMETIC_HRTIME_T],
   AC_CACHE_CHECK([for arithmetic hrtime_t], [gl_cv_arithmetic_hrtime_t],
     [AC_COMPILE_IFELSE(
        [AC_LANG_PROGRAM([[#include <time.h>]],
-	  [[hrtime_t x = 0; return x/x;]])],
+          [[hrtime_t x = 0; return x/x;]])],
        [gl_cv_arithmetic_hrtime_t=yes],
        [gl_cv_arithmetic_hrtime_t=no])])
   if test $gl_cv_arithmetic_hrtime_t = yes; then
@@ -59,14 +59,14 @@ AC_DEFUN([gl_PREREQ_GETHRXTIME],
     AC_CACHE_CHECK([whether CLOCK_MONOTONIC or CLOCK_REALTIME is defined],
       gl_cv_have_clock_gettime_macro,
       [AC_EGREP_CPP([have_clock_gettime_macro],
-	[
+        [
 #        include <time.h>
 #        if defined CLOCK_MONOTONIC || defined CLOCK_REALTIME
-	  have_clock_gettime_macro
+          have_clock_gettime_macro
 #        endif
-	],
-	gl_cv_have_clock_gettime_macro=yes,
-	gl_cv_have_clock_gettime_macro=no)])
+        ],
+        gl_cv_have_clock_gettime_macro=yes,
+        gl_cv_have_clock_gettime_macro=no)])
     if test $gl_cv_have_clock_gettime_macro = yes; then
       LIB_GETHRXTIME=$LIB_CLOCK_GETTIME
     fi
diff --git a/m4/getline.m4 b/m4/getline.m4
index 4897bc3690..fd01a493cf 100644
--- a/m4/getline.m4
+++ b/m4/getline.m4
@@ -23,9 +23,9 @@ AC_DEFUN([gl_FUNC_GETLINE],
 
   gl_getline_needs_run_time_check=no
   AC_CHECK_FUNC([getline],
-		dnl Found it in some library.  Verify that it works.
-		gl_getline_needs_run_time_check=yes,
-		am_cv_func_working_getline=no)
+                dnl Found it in some library.  Verify that it works.
+                gl_getline_needs_run_time_check=yes,
+                am_cv_func_working_getline=no)
   if test $gl_getline_needs_run_time_check = yes; then
     AC_CACHE_CHECK([for working getline function], [am_cv_func_working_getline],
     [echo fooN |tr -d '\012'|tr N '\012' > conftest.data
@@ -40,7 +40,7 @@ AC_DEFUN([gl_FUNC_GETLINE],
       int len;
       FILE *in = fopen ("./conftest.data", "r");
       if (!in)
-	return 1;
+        return 1;
       len = getline (&line, &siz, in);
       exit ((len == 4 && line && strcmp (line, "foo\n") == 0) ? 0 : 1);
     }
diff --git a/m4/getloadavg.m4 b/m4/getloadavg.m4
index dc4226a30c..694976d7a4 100644
--- a/m4/getloadavg.m4
+++ b/m4/getloadavg.m4
@@ -60,17 +60,17 @@ if test $gl_have_func = no; then
   gl_getloadavg_LIBS=$LIBS
   LIBS="-L/usr/local/lib $LIBS"
   AC_CHECK_LIB([getloadavg], [getloadavg],
-	       [LIBS="-lgetloadavg $LIBS"], [LIBS=$gl_getloadavg_LIBS])
+               [LIBS="-lgetloadavg $LIBS"], [LIBS=$gl_getloadavg_LIBS])
 fi
 
 # Make sure it is really in the library, if we think we found it,
 # otherwise set up the replacement function.
 AC_CHECK_FUNCS([getloadavg], [],
-	       [gl_PREREQ_GETLOADAVG])
+               [gl_PREREQ_GETLOADAVG])
 
 # Some definitions of getloadavg require that the program be installed setgid.
 AC_CACHE_CHECK([whether getloadavg requires setgid],
-	       gl_cv_func_getloadavg_setgid,
+               gl_cv_func_getloadavg_setgid,
 [AC_EGREP_CPP([Yowza Am I SETGID yet],
 [#define CONFIGURING_GETLOADAVG
 #include "$srcdir/$1/getloadavg.c"
@@ -78,13 +78,13 @@ AC_CACHE_CHECK([whether getloadavg requires setgid],
 Yowza Am I SETGID yet
 #endif
 ],
-	      gl_cv_func_getloadavg_setgid=yes,
-	      gl_cv_func_getloadavg_setgid=no)])
+              gl_cv_func_getloadavg_setgid=yes,
+              gl_cv_func_getloadavg_setgid=no)])
 if test $gl_cv_func_getloadavg_setgid = yes; then
   NEED_SETGID=true
   AC_DEFINE([GETLOADAVG_PRIVILEGED], [1],
-	    [Define to 1 if the `getloadavg' function needs to be run setuid
-	     or setgid.])
+            [Define to 1 if the `getloadavg' function needs to be run setuid
+             or setgid.])
 else
   NEED_SETGID=false
 fi
@@ -98,8 +98,8 @@ if test $gl_cv_func_getloadavg_setgid = yes; then
   test -z "$ac_ls_output" && ac_ls_output=`ls -lg /dev/kmem`
   gl_cv_group_kmem=`echo $ac_ls_output \
     | sed -ne ['s/[	 ][	 ]*/ /g
-	       s/^.[sSrwx-]* *[0-9]* *\([^0-9]*\)  *.*/\1/
-	       / /s/.* //;p']`
+               s/^.[sSrwx-]* *[0-9]* *\([^0-9]*\)  *.*/\1/
+               / /s/.* //;p']`
 ])
   AC_SUBST([KMEM_GROUP], [$gl_cv_group_kmem])dnl
 fi
@@ -154,8 +154,8 @@ if test $gl_have_func = no; then
   [gl_have_func=yes
    AC_DEFINE([UMAX], [1], [Define to 1 for Encore UMAX.])
    AC_DEFINE([UMAX4_3], [1],
-	     [Define to 1 for Encore UMAX 4.3 that has <inq_status/cpustats.h>
-	      instead of <sys/cpustats.h>.])])
+             [Define to 1 for Encore UMAX 4.3 that has <inq_status/cpustats.h>
+              instead of <sys/cpustats.h>.])])
 fi
 
 if test $gl_have_func = no; then
@@ -169,18 +169,18 @@ fi
 
 AC_CHECK_HEADERS([nlist.h],
 [AC_CHECK_MEMBERS([struct nlist.n_un.n_name],
-		  [AC_DEFINE([NLIST_NAME_UNION], [1],
-			     [Define to 1 if your `struct nlist' has an
-			      `n_un' member.  Obsolete, depend on
-			      `HAVE_STRUCT_NLIST_N_UN_N_NAME])], [],
-		  [@%:@include <nlist.h>])
+                  [AC_DEFINE([NLIST_NAME_UNION], [1],
+                             [Define to 1 if your `struct nlist' has an
+                              `n_un' member.  Obsolete, depend on
+                              `HAVE_STRUCT_NLIST_N_UN_N_NAME])], [],
+                  [@%:@include <nlist.h>])
  AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <nlist.h>]],
-		   [[struct nlist x;
-		    #ifdef HAVE_STRUCT_NLIST_N_UN_N_NAME
-		    x.n_un.n_name = "";
-		    #else
-		    x.n_name = "";
-		    #endif]])],
+                   [[struct nlist x;
+                    #ifdef HAVE_STRUCT_NLIST_N_UN_N_NAME
+                    x.n_un.n_name = "";
+                    #else
+                    x.n_name = "";
+                    #endif]])],
                 [AC_DEFINE([N_NAME_POINTER], [1],
                            [Define to 1 if the nlist n_name member is a pointer])])
 ])dnl
diff --git a/m4/getopt.m4 b/m4/getopt.m4
index 264b57f9f2..58098160cc 100644
--- a/m4/getopt.m4
+++ b/m4/getopt.m4
@@ -191,9 +191,9 @@ main ()
        POSIXLY_CORRECT=1
        export POSIXLY_CORRECT
        AC_RUN_IFELSE(
-	[AC_LANG_PROGRAM([[#include <getopt.h>
-			   #include <stddef.h>
-			   #include <string.h>
+        [AC_LANG_PROGRAM([[#include <getopt.h>
+                           #include <stddef.h>
+                           #include <string.h>
 #if !HAVE_DECL_OPTRESET
 # define OPTIND_MIN 0
 #else
@@ -238,10 +238,10 @@ main ()
                  return 7;
              }
              return 0;
-	   ]])],
-	[gl_cv_func_getopt_gnu=yes],
-	[gl_cv_func_getopt_gnu=no],
-	[dnl Cross compiling. Guess based on host and declarations.
+           ]])],
+        [gl_cv_func_getopt_gnu=yes],
+        [gl_cv_func_getopt_gnu=no],
+        [dnl Cross compiling. Guess based on host and declarations.
          case $host_os:$ac_cv_have_decl_optreset in
            *-gnu*:* | mingw*:*) gl_cv_func_getopt_gnu=no;;
            *:yes)               gl_cv_func_getopt_gnu=no;;
diff --git a/m4/gettimeofday.m4 b/m4/gettimeofday.m4
index 0fec7d42b7..ad519630b8 100644
--- a/m4/gettimeofday.m4
+++ b/m4/gettimeofday.m4
@@ -17,16 +17,16 @@ AC_DEFUN([gl_FUNC_GETTIMEOFDAY],
     [gl_cv_func_gettimeofday_posix_signature],
     [AC_COMPILE_IFELSE(
        [AC_LANG_PROGRAM(
-	  [[#include <sys/time.h>
-	    struct timeval c;
-	  ]],
-	  [[
-	    int (*f) (struct timeval *restrict, void *restrict) = gettimeofday;
-	    int x = f (&c, 0);
-	    return !(x | c.tv_sec | c.tv_usec);
-	  ]])],
-	[gl_cv_func_gettimeofday_posix_signature=yes],
-	[gl_cv_func_gettimeofday_posix_signature=no])])
+          [[#include <sys/time.h>
+            struct timeval c;
+          ]],
+          [[
+            int (*f) (struct timeval *restrict, void *restrict) = gettimeofday;
+            int x = f (&c, 0);
+            return !(x | c.tv_sec | c.tv_usec);
+          ]])],
+        [gl_cv_func_gettimeofday_posix_signature=yes],
+        [gl_cv_func_gettimeofday_posix_signature=no])])
 
   gl_FUNC_GETTIMEOFDAY_CLOBBER
 
@@ -56,21 +56,21 @@ AC_DEFUN([gl_FUNC_GETTIMEOFDAY_CLOBBER],
   [gl_cv_func_gettimeofday_clobber],
   [AC_RUN_IFELSE(
      [AC_LANG_PROGRAM(
-	[[#include <string.h>
-	  #include <sys/time.h>
-	  #include <time.h>
-	  #include <stdlib.h>
-	]],
-	[[
-	  time_t t = 0;
-	  struct tm *lt;
-	  struct tm saved_lt;
-	  struct timeval tv;
-	  lt = localtime (&t);
-	  saved_lt = *lt;
-	  gettimeofday (&tv, NULL);
-	  return memcmp (lt, &saved_lt, sizeof (struct tm)) != 0;
-	]])],
+        [[#include <string.h>
+          #include <sys/time.h>
+          #include <time.h>
+          #include <stdlib.h>
+        ]],
+        [[
+          time_t t = 0;
+          struct tm *lt;
+          struct tm saved_lt;
+          struct timeval tv;
+          lt = localtime (&t);
+          saved_lt = *lt;
+          gettimeofday (&tv, NULL);
+          return memcmp (lt, &saved_lt, sizeof (struct tm)) != 0;
+        ]])],
      [gl_cv_func_gettimeofday_clobber=no],
      [gl_cv_func_gettimeofday_clobber=yes],
      dnl When crosscompiling, assume it is broken.
diff --git a/m4/glibc2.m4 b/m4/glibc2.m4
index fe58a0f326..3435aa233a 100644
--- a/m4/glibc2.m4
+++ b/m4/glibc2.m4
@@ -12,16 +12,16 @@ AC_DEFUN([gt_GLIBC2],
     AC_CACHE_CHECK([whether we are using the GNU C Library 2 or newer],
       [ac_cv_gnu_library_2],
       [AC_EGREP_CPP([Lucky GNU user],
-	[
+        [
 #include <features.h>
 #ifdef __GNU_LIBRARY__
  #if (__GLIBC__ >= 2)
   Lucky GNU user
  #endif
 #endif
-	],
-	[ac_cv_gnu_library_2=yes],
-	[ac_cv_gnu_library_2=no])
+        ],
+        [ac_cv_gnu_library_2=yes],
+        [ac_cv_gnu_library_2=no])
       ]
     )
     AC_SUBST([GLIBC2])
diff --git a/m4/glibc21.m4 b/m4/glibc21.m4
index 93fbf47459..12cddfe8b8 100644
--- a/m4/glibc21.m4
+++ b/m4/glibc21.m4
@@ -12,16 +12,16 @@ AC_DEFUN([gl_GLIBC21],
     AC_CACHE_CHECK([whether we are using the GNU C Library 2.1 or newer],
       [ac_cv_gnu_library_2_1],
       [AC_EGREP_CPP([Lucky GNU user],
-	[
+        [
 #include <features.h>
 #ifdef __GNU_LIBRARY__
  #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
   Lucky GNU user
  #endif
 #endif
-	],
-	[ac_cv_gnu_library_2_1=yes],
-	[ac_cv_gnu_library_2_1=no])
+        ],
+        [ac_cv_gnu_library_2_1=yes],
+        [ac_cv_gnu_library_2_1=no])
       ]
     )
     AC_SUBST([GLIBC21])
diff --git a/m4/glob.m4 b/m4/glob.m4
index bc3e67cff1..b0330bd071 100644
--- a/m4/glob.m4
+++ b/m4/glob.m4
@@ -27,8 +27,8 @@ AC_DEFUN([gl_GLOB],
 [     AC_COMPILE_IFELSE(
 [[#include <gnu-versions.h>
 char a[_GNU_GLOB_INTERFACE_VERSION == 1 ? 1 : -1];]],
-	[gl_cv_gnu_glob_interface_version_1=yes],
-	[gl_cv_gnu_glob_interface_version_1=no])])
+        [gl_cv_gnu_glob_interface_version_1=yes],
+        [gl_cv_gnu_glob_interface_version_1=no])])
 
     if test "$gl_cv_gnu_glob_interface_version_1" = "no"; then
       GLOB_H=glob.h
diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4
index c8fda20330..75da53db07 100644
--- a/m4/gnulib-common.m4
+++ b/m4/gnulib-common.m4
@@ -70,13 +70,13 @@ AC_DEFUN([AC_C_RESTRICT],
    for ac_kw in __restrict __restrict__ _Restrict restrict; do
      AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
       [[typedef int * int_ptr;
-	int foo (int_ptr $ac_kw ip) {
-	return ip[0];
+        int foo (int_ptr $ac_kw ip) {
+        return ip[0];
        }]],
       [[int s[1];
-	int * $ac_kw t = s;
-	t[0] = 0;
-	return foo(t)]])],
+        int * $ac_kw t = s;
+        t[0] = 0;
+        return foo(t)]])],
       [ac_cv_c_restrict=$ac_kw])
      test "$ac_cv_c_restrict" != no && break
    done
diff --git a/m4/host-os.m4 b/m4/host-os.m4
index 375210bb69..df40be241d 100644
--- a/m4/host-os.m4
+++ b/m4/host-os.m4
@@ -20,60 +20,60 @@ AC_DEFUN([gl_HOST_OS],
 
        # These operating system names do not use the default heuristic below.
        # They are in reverse order, so that more-specific prefixes come first.
-       winnt*)		os='Windows NT';;
-       vos*)		os='VOS';;
-       sysv*)		os='Unix System V';;
-       superux*)	os='SUPER-UX';;
-       sunos*)		os='SunOS';;
-       stop*)		os='STOP';;
-       sco*)		os='SCO Unix';;
-       riscos*)		os='RISC OS';;
-       riscix*)		os='RISCiX';;
-       qnx*)		os='QNX';;
-       pw32*)		os='PW32';;
-       ptx*)		os='ptx';;
-       plan9*)		os='Plan 9';;
-       osf*)		os='Tru64';;
-       os2*)		os='OS/2';;
-       openbsd*)	os='OpenBSD';;
-       nsk*)		os='NonStop Kernel';;
-       nonstopux*)	os='NonStop-UX';;
-       netbsd*-gnu*)	os='GNU/NetBSD';; # NetBSD kernel+libc, GNU userland
-       netbsd*)		os='NetBSD';;
-       knetbsd*-gnu)	os='GNU/kNetBSD';; # NetBSD kernel, GNU libc+userland
-       kfreebsd*-gnu)	os='GNU/kFreeBSD';; # FreeBSD kernel, GNU libc+userland
-       msdosdjgpp*)	os='DJGPP';;
-       mpeix*)		os='MPE/iX';;
-       mint*)		os='MiNT';;
-       mingw*)		os='MinGW';;
-       lynxos*)		os='LynxOS';;
-       linux*)		os='GNU/Linux';;
-       hpux*)		os='HP-UX';;
-       hiux*)		os='HI-UX';;
-       gnu*)		os='GNU';;
-       freebsd*)	os='FreeBSD';;
-       dgux*)		os='DG/UX';;
-       bsdi*)		os='BSD/OS';;
-       bsd*)		os='BSD';;
-       beos*)		os='BeOS';;
-       aux*)		os='A/UX';;
-       atheos*)		os='AtheOS';;
-       amigaos*)	os='Amiga OS';;
-       aix*)		os='AIX';;
+       winnt*)          os='Windows NT';;
+       vos*)            os='VOS';;
+       sysv*)           os='Unix System V';;
+       superux*)        os='SUPER-UX';;
+       sunos*)          os='SunOS';;
+       stop*)           os='STOP';;
+       sco*)            os='SCO Unix';;
+       riscos*)         os='RISC OS';;
+       riscix*)         os='RISCiX';;
+       qnx*)            os='QNX';;
+       pw32*)           os='PW32';;
+       ptx*)            os='ptx';;
+       plan9*)          os='Plan 9';;
+       osf*)            os='Tru64';;
+       os2*)            os='OS/2';;
+       openbsd*)        os='OpenBSD';;
+       nsk*)            os='NonStop Kernel';;
+       nonstopux*)      os='NonStop-UX';;
+       netbsd*-gnu*)    os='GNU/NetBSD';; # NetBSD kernel+libc, GNU userland
+       netbsd*)         os='NetBSD';;
+       knetbsd*-gnu)    os='GNU/kNetBSD';; # NetBSD kernel, GNU libc+userland
+       kfreebsd*-gnu)   os='GNU/kFreeBSD';; # FreeBSD kernel, GNU libc+userland
+       msdosdjgpp*)     os='DJGPP';;
+       mpeix*)          os='MPE/iX';;
+       mint*)           os='MiNT';;
+       mingw*)          os='MinGW';;
+       lynxos*)         os='LynxOS';;
+       linux*)          os='GNU/Linux';;
+       hpux*)           os='HP-UX';;
+       hiux*)           os='HI-UX';;
+       gnu*)            os='GNU';;
+       freebsd*)        os='FreeBSD';;
+       dgux*)           os='DG/UX';;
+       bsdi*)           os='BSD/OS';;
+       bsd*)            os='BSD';;
+       beos*)           os='BeOS';;
+       aux*)            os='A/UX';;
+       atheos*)         os='AtheOS';;
+       amigaos*)        os='Amiga OS';;
+       aix*)            os='AIX';;
 
        # The default heuristic takes the initial alphabetic string
        # from $host_os, but capitalizes its first letter.
        [A-Za-z]*)
-	 os=`
-	   expr "X$host_os" : 'X\([A-Za-z]\)' | tr '[a-z]' '[A-Z]'
-	 ``
-	   expr "X$host_os" : 'X.\([A-Za-z]*\)'
-	 `
-	 ;;
+         os=`
+           expr "X$host_os" : 'X\([A-Za-z]\)' | tr '[a-z]' '[A-Z]'
+         ``
+           expr "X$host_os" : 'X.\([A-Za-z]*\)'
+         `
+         ;;
 
        # If $host_os does not start with an alphabetic string, use it unchanged.
        *)
-	 os=$host_os;;
+         os=$host_os;;
      esac
      gl_cv_host_operating_system=$os]])
   AC_DEFINE_UNQUOTED([HOST_OPERATING_SYSTEM],
diff --git a/m4/iconv_open.m4 b/m4/iconv_open.m4
index 8eeef9fcf6..6bf78bc5e4 100644
--- a/m4/iconv_open.m4
+++ b/m4/iconv_open.m4
@@ -90,8 +90,8 @@ int main ()
     outptr = buf;
     outbytesleft = sizeof (buf);
     res = iconv (cd,
-		 (ICONV_CONST char **) &inptr, &inbytesleft,
-		 &outptr, &outbytesleft);
+                 (ICONV_CONST char **) &inptr, &inbytesleft,
+                 &outptr, &outbytesleft);
     ASSERT (res == 0 && inbytesleft == 0);
     ASSERT (outptr == buf + (sizeof (expected) - 1));
     ASSERT (memcmp (buf, expected, sizeof (expected) - 1) == 0);
@@ -117,8 +117,8 @@ int main ()
     outptr = buf;
     outbytesleft = sizeof (buf);
     res = iconv (cd,
-		 (ICONV_CONST char **) &inptr, &inbytesleft,
-		 &outptr, &outbytesleft);
+                 (ICONV_CONST char **) &inptr, &inbytesleft,
+                 &outptr, &outbytesleft);
     ASSERT (res == 0 && inbytesleft == 0);
     ASSERT (outptr == buf + (sizeof (expected) - 1));
     ASSERT (memcmp (buf, expected, sizeof (expected) - 1) == 0);
@@ -144,8 +144,8 @@ int main ()
     outptr = buf;
     outbytesleft = sizeof (buf);
     res = iconv (cd,
-		 (ICONV_CONST char **) &inptr, &inbytesleft,
-		 &outptr, &outbytesleft);
+                 (ICONV_CONST char **) &inptr, &inbytesleft,
+                 &outptr, &outbytesleft);
     ASSERT (res == 0 && inbytesleft == 0);
     ASSERT (outptr == buf + (sizeof (expected) - 1));
     ASSERT (memcmp (buf, expected, sizeof (expected) - 1) == 0);
@@ -171,8 +171,8 @@ int main ()
     outptr = buf;
     outbytesleft = sizeof (buf);
     res = iconv (cd,
-		 (ICONV_CONST char **) &inptr, &inbytesleft,
-		 &outptr, &outbytesleft);
+                 (ICONV_CONST char **) &inptr, &inbytesleft,
+                 &outptr, &outbytesleft);
     ASSERT (res == 0 && inbytesleft == 0);
     ASSERT (outptr == buf + (sizeof (expected) - 1));
     ASSERT (memcmp (buf, expected, sizeof (expected) - 1) == 0);
@@ -199,8 +199,8 @@ int main ()
     outptr = buf;
     outbytesleft = sizeof (buf);
     res = iconv (cd,
-		 (ICONV_CONST char **) &inptr, &inbytesleft,
-		 &outptr, &outbytesleft);
+                 (ICONV_CONST char **) &inptr, &inbytesleft,
+                 &outptr, &outbytesleft);
     ASSERT (res == 0 && inbytesleft == 0);
     ASSERT (outptr == buf + (sizeof (expected) - 1));
     ASSERT (memcmp (buf, expected, sizeof (expected) - 1) == 0);
diff --git a/m4/include_next.m4 b/m4/include_next.m4
index 5e22ded936..2e6273f839 100644
--- a/m4/include_next.m4
+++ b/m4/include_next.m4
@@ -109,11 +109,11 @@ EOF
 # be
 # '"///usr/include/foo.h"', or whatever other absolute file name is suitable.
 # That way, a header file with the following line:
-#	#@INCLUDE_NEXT@ @NEXT_FOO_H@
+#       #@INCLUDE_NEXT@ @NEXT_FOO_H@
 # or
-#	#@INCLUDE_NEXT_AS_FIRST_DIRECTIVE@ @NEXT_AS_FIRST_DIRECTIVE_FOO_H@
+#       #@INCLUDE_NEXT_AS_FIRST_DIRECTIVE@ @NEXT_AS_FIRST_DIRECTIVE_FOO_H@
 # behaves (after sed substitution) as if it contained
-#	#include_next <foo.h>
+#       #include_next <foo.h>
 # even if the compiler does not support include_next.
 # The three "///" are to pacify Sun C 5.8, which otherwise would say
 # "warning: #include of /usr/include/... may be non-portable".
@@ -129,46 +129,46 @@ AC_DEFUN([gl_CHECK_NEXT_HEADERS],
 
   m4_foreach_w([gl_HEADER_NAME], [$1],
     [AS_VAR_PUSHDEF([gl_next_header],
-		    [gl_cv_next_]m4_defn([gl_HEADER_NAME]))
+                    [gl_cv_next_]m4_defn([gl_HEADER_NAME]))
      if test $gl_cv_have_include_next = yes; then
        AS_VAR_SET([gl_next_header], ['<'gl_HEADER_NAME'>'])
      else
        AC_CACHE_CHECK(
-	 [absolute name of <]m4_defn([gl_HEADER_NAME])[>],
-	 m4_defn([gl_next_header]),
-	 [AS_VAR_PUSHDEF([gl_header_exists],
-			 [ac_cv_header_]m4_defn([gl_HEADER_NAME]))
-	  if test AS_VAR_GET(gl_header_exists) = yes; then
-	    AC_LANG_CONFTEST(
-	      [AC_LANG_SOURCE(
-		 [[#include <]]m4_dquote(m4_defn([gl_HEADER_NAME]))[[>]]
-	       )])
-	    dnl AIX "xlc -E" and "cc -E" omit #line directives for header files
-	    dnl that contain only a #include of other header files and no
-	    dnl non-comment tokens of their own. This leads to a failure to
-	    dnl detect the absolute name of <dirent.h>, <signal.h>, <poll.h>
-	    dnl and others. The workaround is to force preservation of comments
-	    dnl through option -C. This ensures all necessary #line directives
-	    dnl are present. GCC supports option -C as well.
-	    case "$host_os" in
-	      aix*) gl_absname_cpp="$ac_cpp -C" ;;
-	      *)    gl_absname_cpp="$ac_cpp" ;;
-	    esac
-	    dnl eval is necessary to expand gl_absname_cpp.
-	    dnl Ultrix and Pyramid sh refuse to redirect output of eval,
-	    dnl so use subshell.
-	    AS_VAR_SET([gl_next_header],
-	      ['"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD |
-	       sed -n '\#/]m4_defn([gl_HEADER_NAME])[#{
-		 s#.*"\(.*/]m4_defn([gl_HEADER_NAME])[\)".*#\1#
-		 s#^/[^/]#//&#
-		 p
-		 q
-	       }'`'"'])
-	  else
-	    AS_VAR_SET([gl_next_header], ['<'gl_HEADER_NAME'>'])
-	  fi
-	  AS_VAR_POPDEF([gl_header_exists])])
+         [absolute name of <]m4_defn([gl_HEADER_NAME])[>],
+         m4_defn([gl_next_header]),
+         [AS_VAR_PUSHDEF([gl_header_exists],
+                         [ac_cv_header_]m4_defn([gl_HEADER_NAME]))
+          if test AS_VAR_GET(gl_header_exists) = yes; then
+            AC_LANG_CONFTEST(
+              [AC_LANG_SOURCE(
+                 [[#include <]]m4_dquote(m4_defn([gl_HEADER_NAME]))[[>]]
+               )])
+            dnl AIX "xlc -E" and "cc -E" omit #line directives for header files
+            dnl that contain only a #include of other header files and no
+            dnl non-comment tokens of their own. This leads to a failure to
+            dnl detect the absolute name of <dirent.h>, <signal.h>, <poll.h>
+            dnl and others. The workaround is to force preservation of comments
+            dnl through option -C. This ensures all necessary #line directives
+            dnl are present. GCC supports option -C as well.
+            case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+            dnl eval is necessary to expand gl_absname_cpp.
+            dnl Ultrix and Pyramid sh refuse to redirect output of eval,
+            dnl so use subshell.
+            AS_VAR_SET([gl_next_header],
+              ['"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD |
+               sed -n '\#/]m4_defn([gl_HEADER_NAME])[#{
+                 s#.*"\(.*/]m4_defn([gl_HEADER_NAME])[\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'])
+          else
+            AS_VAR_SET([gl_next_header], ['<'gl_HEADER_NAME'>'])
+          fi
+          AS_VAR_POPDEF([gl_header_exists])])
      fi
      AC_SUBST(
        AS_TR_CPP([NEXT_]m4_defn([gl_HEADER_NAME])),
diff --git a/m4/inttypes.m4 b/m4/inttypes.m4
index 8b4e4f852a..e1c656d149 100644
--- a/m4/inttypes.m4
+++ b/m4/inttypes.m4
@@ -26,13 +26,13 @@ AC_DEFUN([gl_INTTYPES_H],
     [gl_cv_header_working_inttypes_h],
     [gl_cv_header_working_inttypes_h=no
      if test "$gl_cv_header_working_stdint_h" = yes \
-	&& test $ac_cv_header_inttypes_h = yes \
-	&& test "$ac_cv_have_decl_imaxabs" = yes \
-	&& test "$ac_cv_have_decl_imaxdiv" = yes \
-	&& test "$ac_cv_have_decl_strtoimax" = yes \
-	&& test "$ac_cv_have_decl_strtoumax" = yes; then
+        && test $ac_cv_header_inttypes_h = yes \
+        && test "$ac_cv_have_decl_imaxabs" = yes \
+        && test "$ac_cv_have_decl_imaxdiv" = yes \
+        && test "$ac_cv_have_decl_strtoimax" = yes \
+        && test "$ac_cv_have_decl_strtoumax" = yes; then
        AC_COMPILE_IFELSE([
-	 AC_LANG_PROGRAM([[
+         AC_LANG_PROGRAM([[
 #include <stddef.h>
 #define __STDC_LIMIT_MACROS 1 /* to make it work also in C++ mode */
 #define __STDC_CONSTANT_MACROS 1 /* to make it work also in C++ mode */
@@ -131,8 +131,8 @@ const char *l = /* implicit string concatenation */
   SCNoPTR SCNuPTR SCNxPTR
 #endif
   ;
-	 ]])],
-	 [gl_cv_header_working_inttypes_h=yes])
+         ]])],
+         [gl_cv_header_working_inttypes_h=yes])
      fi])
 
   dnl Override <inttypes.h> always, so that the portability warnings work.
@@ -255,25 +255,25 @@ AC_DEFUN([gl_INTTYPES_CHECK_LONG_LONG_INT_CONDITION],
     [gl_cv_test_$1],
     [AC_COMPILE_IFELSE(
        [AC_LANG_PROGRAM(
-	  [[/* Work also in C++ mode.  */
-	    #define __STDC_LIMIT_MACROS 1
+          [[/* Work also in C++ mode.  */
+            #define __STDC_LIMIT_MACROS 1
 
-	    /* Work if build is not clean.  */
-	    #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H
+            /* Work if build is not clean.  */
+            #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H
 
-	    #include <limits.h>
-	    #if HAVE_STDINT_H
-	     #include <stdint.h>
-	    #endif
+            #include <limits.h>
+            #if HAVE_STDINT_H
+             #include <stdint.h>
+            #endif
 
-	    #if $2
-	     #define CONDITION ($3)
-	    #elif HAVE_LONG_LONG_INT
-	     #define CONDITION ($4)
-	    #else
-	     #define CONDITION 0
-	    #endif
-	    int test[CONDITION ? 1 : -1];]])],
+            #if $2
+             #define CONDITION ($3)
+            #elif HAVE_LONG_LONG_INT
+             #define CONDITION ($4)
+            #else
+             #define CONDITION 0
+            #endif
+            int test[CONDITION ? 1 : -1];]])],
        [gl_cv_test_$1=yes],
        [gl_cv_test_$1=no])])
   if test $gl_cv_test_$1 = yes; then
diff --git a/m4/isapipe.m4 b/m4/isapipe.m4
index 1f0673666a..8f7999cbd7 100644
--- a/m4/isapipe.m4
+++ b/m4/isapipe.m4
@@ -24,50 +24,50 @@ AC_DEFUN([gl_PREREQ_ISAPIPE],
     [gl_cv_pipes_are_fifos],
     [AC_RUN_IFELSE(
        [AC_LANG_SOURCE(
-	  [[#include <stdio.h>
-	    #include <sys/types.h>
-	    #include <sys/stat.h>
-	    #include <unistd.h>
-	    #ifndef S_ISFIFO
-	     #define S_ISFIFO(m) 0
-	    #endif
-	    #ifndef S_ISSOCK
-	     #define S_ISSOCK(m) 0
-	    #endif
-	    int
-	    main (int argc, char **argv)
-	    {
-	      int fd[2];
-	      struct stat st;
-	      if (pipe (fd) != 0 || fstat (fd[0], &st) != 0)
-		return 1;
-	      if (2 <= argc && argv[1][0] == '-')
-		{
-		  char const *yesno = (S_ISFIFO (st.st_mode) ? "yes" : "no");
-		  if (st.st_nlink <= 1)
-		    {
-		      long int i = st.st_nlink;
-		      if (i != st.st_nlink)
-			return 1;
-		      printf ("%s (%ld)\n", yesno, i);
-		    }
-		  else
-		    {
-		      unsigned long int i = st.st_nlink;
-		      if (i != st.st_nlink)
-			return 1;
-		      printf ("%s (%lu)\n", yesno, i);
-		    }
-		}
-	      else
-		{
-		  if (! S_ISFIFO (st.st_mode) && ! S_ISSOCK (st.st_mode))
-		    return 1;
-		}
-	      return 0;
-	    }]])],
+          [[#include <stdio.h>
+            #include <sys/types.h>
+            #include <sys/stat.h>
+            #include <unistd.h>
+            #ifndef S_ISFIFO
+             #define S_ISFIFO(m) 0
+            #endif
+            #ifndef S_ISSOCK
+             #define S_ISSOCK(m) 0
+            #endif
+            int
+            main (int argc, char **argv)
+            {
+              int fd[2];
+              struct stat st;
+              if (pipe (fd) != 0 || fstat (fd[0], &st) != 0)
+                return 1;
+              if (2 <= argc && argv[1][0] == '-')
+                {
+                  char const *yesno = (S_ISFIFO (st.st_mode) ? "yes" : "no");
+                  if (st.st_nlink <= 1)
+                    {
+                      long int i = st.st_nlink;
+                      if (i != st.st_nlink)
+                        return 1;
+                      printf ("%s (%ld)\n", yesno, i);
+                    }
+                  else
+                    {
+                      unsigned long int i = st.st_nlink;
+                      if (i != st.st_nlink)
+                        return 1;
+                      printf ("%s (%lu)\n", yesno, i);
+                    }
+                }
+              else
+                {
+                  if (! S_ISFIFO (st.st_mode) && ! S_ISSOCK (st.st_mode))
+                    return 1;
+                }
+              return 0;
+            }]])],
        [gl_cv_pipes_are_fifos=`./conftest$ac_exeext -`
-	test -z "$gl_cv_pipes_are_fifos" && gl_cv_pipes_are_fifos=no],
+        test -z "$gl_cv_pipes_are_fifos" && gl_cv_pipes_are_fifos=no],
        [gl_cv_pipes_are_fifos=unknown],
        [gl_cv_pipes_are_fifos=cross-compiling])])
 
diff --git a/m4/isinf.m4 b/m4/isinf.m4
index 3d9423106f..6edf48697d 100644
--- a/m4/isinf.m4
+++ b/m4/isinf.m4
@@ -44,6 +44,6 @@ AC_DEFUN([gl_ISINFL_WORKS],
                                      [[return !!isinf(LDBL_MAX);]])],
                     [gl_cv_func_isinfl_works=yes],
                     [gl_cv_func_isinfl_works=no],
-		    [gl_cv_func_isinfl_works="guessing no"])
+                    [gl_cv_func_isinfl_works="guessing no"])
     ])
 ])
diff --git a/m4/jm-winsz1.m4 b/m4/jm-winsz1.m4
index 7804c8a0de..4ae148f67f 100644
--- a/m4/jm-winsz1.m4
+++ b/m4/jm-winsz1.m4
@@ -10,7 +10,7 @@ dnl From Jim Meyering and Paul Eggert.
 AC_DEFUN([gl_HEADER_TIOCGWINSZ_IN_TERMIOS_H],
 [AC_REQUIRE([AC_SYS_POSIX_TERMIOS])
  AC_CACHE_CHECK([whether use of TIOCGWINSZ requires termios.h],
-	        gl_cv_sys_tiocgwinsz_needs_termios_h,
+                gl_cv_sys_tiocgwinsz_needs_termios_h,
   [gl_cv_sys_tiocgwinsz_needs_termios_h=no
 
    if test $ac_cv_sys_posix_termios = yes; then
@@ -31,16 +31,16 @@ AC_DEFUN([gl_WINSIZE_IN_PTEM],
      gl_cv_sys_struct_winsize_needs_sys_ptem_h,
      [gl_cv_sys_struct_winsize_needs_sys_ptem_h=yes
       if test $ac_cv_sys_posix_termios = yes; then
-	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <termios.h>]],
-	  [[struct winsize x;
-	    if (sizeof x > 0) return 0;]])],
+        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <termios.h>]],
+          [[struct winsize x;
+            if (sizeof x > 0) return 0;]])],
           [gl_cv_sys_struct_winsize_needs_sys_ptem_h=no])
       fi
       if test $gl_cv_sys_struct_winsize_needs_sys_ptem_h = yes; then
-	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/ptem.h>]],
-	  [[struct winsize x;
-	    if (sizeof x > 0) return 0;]])],
-	  [], [gl_cv_sys_struct_winsize_needs_sys_ptem_h=no])
+        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/ptem.h>]],
+          [[struct winsize x;
+            if (sizeof x > 0) return 0;]])],
+          [], [gl_cv_sys_struct_winsize_needs_sys_ptem_h=no])
       fi])
    if test $gl_cv_sys_struct_winsize_needs_sys_ptem_h = yes; then
      AC_DEFINE([WINSIZE_IN_PTEM], [1],
diff --git a/m4/jm-winsz2.m4 b/m4/jm-winsz2.m4
index f3155e72e3..ba6424f8b8 100644
--- a/m4/jm-winsz2.m4
+++ b/m4/jm-winsz2.m4
@@ -8,7 +8,7 @@
 AC_DEFUN([gl_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL],
 [AC_REQUIRE([gl_HEADER_TIOCGWINSZ_IN_TERMIOS_H])
  AC_CACHE_CHECK([whether use of TIOCGWINSZ requires sys/ioctl.h],
-	        gl_cv_sys_tiocgwinsz_needs_sys_ioctl_h,
+                gl_cv_sys_tiocgwinsz_needs_sys_ioctl_h,
   [gl_cv_sys_tiocgwinsz_needs_sys_ioctl_h=no
 
   if test $gl_cv_sys_tiocgwinsz_needs_termios_h = no; then
diff --git a/m4/ld-version-script.m4 b/m4/ld-version-script.m4
index a97888f249..43b725b4a6 100644
--- a/m4/ld-version-script.m4
+++ b/m4/ld-version-script.m4
@@ -27,7 +27,7 @@ AC_DEFUN([gl_LD_VERSION_SCRIPT],
     LDFLAGS="$LDFLAGS -Wl,--version-script=conftest.map"
     cat > conftest.map <<EOF
 VERS_1 {
-	global: sym;
+        global: sym;
 };
 
 VERS_2 {
diff --git a/m4/lib-ignore.m4 b/m4/lib-ignore.m4
index e518f81133..2b0e1bbd0e 100644
--- a/m4/lib-ignore.m4
+++ b/m4/lib-ignore.m4
@@ -26,13 +26,13 @@ AC_DEFUN([gl_IGNORE_UNUSED_LIBRARIES],
      # native cc issues annoying warnings and then ignores it,
      # which would cause us to incorrectly conclude that it worked.
      for gl_flags in \
-	'-Wl,--as-needed' \
-	'-Wl,-z,ignore' \
-	'-z ignore'
+        '-Wl,--as-needed' \
+        '-Wl,-z,ignore' \
+        '-z ignore'
      do
        LDFLAGS="$gl_flags $LDFLAGS"
        AC_LINK_IFELSE([AC_LANG_PROGRAM()],
-	 [gl_cv_ignore_unused_libraries=$gl_flags])
+         [gl_cv_ignore_unused_libraries=$gl_flags])
        LDFLAGS=$gl_saved_ldflags
        test "$gl_cv_ignore_unused_libraries" != none && break
      done
diff --git a/m4/lib-ld.m4 b/m4/lib-ld.m4
index e4863f2c9b..4b4db0798d 100644
--- a/m4/lib-ld.m4
+++ b/m4/lib-ld.m4
@@ -59,7 +59,7 @@ if test "$GCC" = yes; then
       # Canonicalize the path of ld
       ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
       while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+        ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
       done
       test -z "$LD" && LD="$ac_prog"
       ;;
@@ -89,9 +89,9 @@ AC_CACHE_VAL([acl_cv_path_LD],
       # Break only if it was the GNU/non-GNU ld that we prefer.
       case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
       *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break ;;
+        test "$with_gnu_ld" != no && break ;;
       *)
-	test "$with_gnu_ld" != yes && break ;;
+        test "$with_gnu_ld" != yes && break ;;
       esac
     fi
   done
diff --git a/m4/link-follow.m4 b/m4/link-follow.m4
index d2c5dd998e..8b7ca11176 100644
--- a/m4/link-follow.m4
+++ b/m4/link-follow.m4
@@ -23,7 +23,7 @@ AC_DEFUN([gl_FUNC_LINK_FOLLOWS_SYMLINK],
   gl_link_follows_symlinks=0 # assume GNU behavior
   if test $ac_cv_func_readlink = yes; then
     AC_CACHE_CHECK([whether link(2) dereferences a symlink],
-		    gl_cv_func_link_follows_symlink,
+                    gl_cv_func_link_follows_symlink,
     [
       # Create a regular file.
       echo > conftest.file
@@ -34,38 +34,38 @@ AC_DEFUN([gl_FUNC_LINK_FOLLOWS_SYMLINK],
 #       include <stdlib.h>
 
 #       define SAME_INODE(Stat_buf_1, Stat_buf_2) \
-	  ((Stat_buf_1).st_ino == (Stat_buf_2).st_ino \
-	   && (Stat_buf_1).st_dev == (Stat_buf_2).st_dev)
+          ((Stat_buf_1).st_ino == (Stat_buf_2).st_ino \
+           && (Stat_buf_1).st_dev == (Stat_buf_2).st_dev)
 
-	int
-	main ()
-	{
-	  const char *file = "conftest.file";
-	  const char *sym = "conftest.sym";
-	  const char *hard = "conftest.hard";
-	  struct stat sb_file, sb_hard;
+        int
+        main ()
+        {
+          const char *file = "conftest.file";
+          const char *sym = "conftest.sym";
+          const char *hard = "conftest.hard";
+          struct stat sb_file, sb_hard;
 
-	  /* Create a symlink to the regular file. */
-	  if (symlink (file, sym))
-	    return 2;
+          /* Create a symlink to the regular file. */
+          if (symlink (file, sym))
+            return 2;
 
-	  /* Create a hard link to that symlink.  */
-	  if (link (sym, hard))
-	    return 3;
+          /* Create a hard link to that symlink.  */
+          if (link (sym, hard))
+            return 3;
 
-	  if (lstat (hard, &sb_hard))
-	    return 4;
-	  if (lstat (file, &sb_file))
-	    return 5;
+          if (lstat (hard, &sb_hard))
+            return 4;
+          if (lstat (file, &sb_file))
+            return 5;
 
-	  /* If the dev/inode of hard and file are the same, then
-	     the link call followed the symlink.  */
-	  return SAME_INODE (sb_hard, sb_file) ? 1 : 0;
-	}
+          /* If the dev/inode of hard and file are the same, then
+             the link call followed the symlink.  */
+          return SAME_INODE (sb_hard, sb_file) ? 1 : 0;
+        }
       ]])],
-	[gl_cv_func_link_follows_symlink=no], dnl GNU behavior
-	[gl_cv_func_link_follows_symlink=yes], dnl Followed link/compile failed
-	[gl_cv_func_link_follows_symlink=unknown] dnl We're cross compiling.
+        [gl_cv_func_link_follows_symlink=no], dnl GNU behavior
+        [gl_cv_func_link_follows_symlink=yes], dnl Followed link/compile failed
+        [gl_cv_func_link_follows_symlink=unknown] dnl We're cross compiling.
       )
       rm -f conftest.file conftest.sym conftest.hard
     ])
diff --git a/m4/longlong.m4 b/m4/longlong.m4
index eedc8d5682..6d17ea3731 100644
--- a/m4/longlong.m4
+++ b/m4/longlong.m4
@@ -20,30 +20,30 @@ AC_DEFUN([AC_TYPE_LONG_LONG_INT],
     [AC_LINK_IFELSE(
        [_AC_TYPE_LONG_LONG_SNIPPET],
        [dnl This catches a bug in Tandem NonStop Kernel (OSS) cc -O circa 2004.
-	dnl If cross compiling, assume the bug isn't important, since
-	dnl nobody cross compiles for this platform as far as we know.
-	AC_RUN_IFELSE(
-	  [AC_LANG_PROGRAM(
-	     [[@%:@include <limits.h>
-	       @%:@ifndef LLONG_MAX
-	       @%:@ define HALF \
-			(1LL << (sizeof (long long int) * CHAR_BIT - 2))
-	       @%:@ define LLONG_MAX (HALF - 1 + HALF)
-	       @%:@endif]],
-	     [[long long int n = 1;
-	       int i;
-	       for (i = 0; ; i++)
-		 {
-		   long long int m = n << i;
-		   if (m >> i != n)
-		     return 1;
-		   if (LLONG_MAX / 2 < m)
-		     break;
-		 }
-	       return 0;]])],
-	  [ac_cv_type_long_long_int=yes],
-	  [ac_cv_type_long_long_int=no],
-	  [ac_cv_type_long_long_int=yes])],
+        dnl If cross compiling, assume the bug isn't important, since
+        dnl nobody cross compiles for this platform as far as we know.
+        AC_RUN_IFELSE(
+          [AC_LANG_PROGRAM(
+             [[@%:@include <limits.h>
+               @%:@ifndef LLONG_MAX
+               @%:@ define HALF \
+                        (1LL << (sizeof (long long int) * CHAR_BIT - 2))
+               @%:@ define LLONG_MAX (HALF - 1 + HALF)
+               @%:@endif]],
+             [[long long int n = 1;
+               int i;
+               for (i = 0; ; i++)
+                 {
+                   long long int m = n << i;
+                   if (m >> i != n)
+                     return 1;
+                   if (LLONG_MAX / 2 < m)
+                     break;
+                 }
+               return 0;]])],
+          [ac_cv_type_long_long_int=yes],
+          [ac_cv_type_long_long_int=no],
+          [ac_cv_type_long_long_int=yes])],
        [ac_cv_type_long_long_int=no])])
   if test $ac_cv_type_long_long_int = yes; then
     AC_DEFINE([HAVE_LONG_LONG_INT], [1],
@@ -83,24 +83,24 @@ AC_DEFUN([_AC_TYPE_LONG_LONG_SNIPPET],
 [
   AC_LANG_PROGRAM(
     [[/* For now, do not test the preprocessor; as of 2007 there are too many
-	 implementations with broken preprocessors.  Perhaps this can
-	 be revisited in 2012.  In the meantime, code should not expect
-	 #if to work with literals wider than 32 bits.  */
+         implementations with broken preprocessors.  Perhaps this can
+         be revisited in 2012.  In the meantime, code should not expect
+         #if to work with literals wider than 32 bits.  */
       /* Test literals.  */
       long long int ll = 9223372036854775807ll;
       long long int nll = -9223372036854775807LL;
       unsigned long long int ull = 18446744073709551615ULL;
       /* Test constant expressions.   */
       typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)
-		     ? 1 : -1)];
+                     ? 1 : -1)];
       typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1
-		     ? 1 : -1)];
+                     ? 1 : -1)];
       int i = 63;]],
     [[/* Test availability of runtime routines for shift and division.  */
       long long int llmax = 9223372036854775807ll;
       unsigned long long int ullmax = 18446744073709551615ull;
       return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)
-	      | (llmax / ll) | (llmax % ll)
-	      | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i)
-	      | (ullmax / ull) | (ullmax % ull));]])
+              | (llmax / ll) | (llmax % ll)
+              | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i)
+              | (ullmax / ull) | (ullmax % ull));]])
 ])
diff --git a/m4/ls-mntd-fs.m4 b/m4/ls-mntd-fs.m4
index 42a7ade0ab..48d16da80e 100644
--- a/m4/ls-mntd-fs.m4
+++ b/m4/ls-mntd-fs.m4
@@ -84,7 +84,7 @@ if test -z "$ac_list_mounted_fs"; then
 yes
 #endif
         ], [test $ac_cv_func_listmntent = yes \
-	    && fu_cv_sys_mounted_cray_listmntent=yes]
+            && fu_cv_sys_mounted_cray_listmntent=yes]
       )
     ]
   )
@@ -108,7 +108,7 @@ if test -z "$ac_list_mounted_fs"; then
   if test $fu_cv_sys_mounted_vmount = yes; then
     ac_list_mounted_fs=found
     AC_DEFINE([MOUNTED_VMOUNT], [1],
-	[Define if there is a function named mntctl that can be used to read
+        [Define if there is a function named mntctl that can be used to read
          the list of mounted file systems, and there is a system header file
          that declares `struct vmount.'  (AIX)])
   fi
@@ -123,27 +123,27 @@ if test $ac_cv_func_getmntent = yes; then
     # 4.3BSD, SunOS, HP-UX, Dynix, Irix
     AC_MSG_CHECKING([for one-argument getmntent function])
     AC_CACHE_VAL([fu_cv_sys_mounted_getmntent1],
-		 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+                 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 /* SunOS 4.1.x /usr/include/mntent.h needs this for FILE */
 #include <stdio.h>
 
 #include <mntent.h>
 #if !defined MOUNTED
-# if defined _PATH_MOUNTED	/* GNU libc  */
+# if defined _PATH_MOUNTED      /* GNU libc  */
 #  define MOUNTED _PATH_MOUNTED
 # endif
-# if defined MNT_MNTTAB	/* HP-UX.  */
+# if defined MNT_MNTTAB /* HP-UX.  */
 #  define MOUNTED MNT_MNTTAB
 # endif
-# if defined MNTTABNAME	/* Dynix.  */
+# if defined MNTTABNAME /* Dynix.  */
 #  define MOUNTED MNTTABNAME
 # endif
 #endif
 ]],
                       [[ struct mntent *mnt = 0; char *table = MOUNTED;
                          if (sizeof mnt && sizeof table) return 0;]])],
-		    [fu_cv_sys_mounted_getmntent1=yes],
-		    [fu_cv_sys_mounted_getmntent1=no])])
+                    [fu_cv_sys_mounted_getmntent1=yes],
+                    [fu_cv_sys_mounted_getmntent1=no])])
     AC_MSG_RESULT([$fu_cv_sys_mounted_getmntent1])
     if test $fu_cv_sys_mounted_getmntent1 = yes; then
       ac_list_mounted_fs=found
@@ -197,7 +197,7 @@ $getfsstat_includes]]
   if test $fu_cv_sys_mounted_getfsstat = yes; then
     ac_list_mounted_fs=found
     AC_DEFINE([MOUNTED_GETFSSTAT], [1],
-	      [Define if there is a function named getfsstat for reading the
+              [Define if there is a function named getfsstat for reading the
                list of mounted file systems.  (DEC Alpha running OSF/1)])
   fi
 fi
@@ -228,8 +228,8 @@ if test -z "$ac_list_mounted_fs"; then
   AC_CACHE_VAL([fu_cv_sys_mounted_getmntinfo],
     [
       test "$ac_cv_func_getmntinfo" = yes \
-	  && fu_cv_sys_mounted_getmntinfo=yes \
-	  || fu_cv_sys_mounted_getmntinfo=no
+          && fu_cv_sys_mounted_getmntinfo=yes \
+          || fu_cv_sys_mounted_getmntinfo=no
     ])
   AC_MSG_RESULT([$fu_cv_sys_mounted_getmntinfo])
   if test $fu_cv_sys_mounted_getmntinfo = yes; then
@@ -256,13 +256,13 @@ extern int getmntinfo (struct statfs **, int);
     if test $fu_cv_sys_mounted_getmntinfo2 = no; then
       ac_list_mounted_fs=found
       AC_DEFINE([MOUNTED_GETMNTINFO], [1],
-	        [Define if there is a function named getmntinfo for reading the
+                [Define if there is a function named getmntinfo for reading the
                  list of mounted file systems and it returns an array of
                  'struct statfs'.  (4.4BSD, Darwin)])
     else
       ac_list_mounted_fs=found
       AC_DEFINE([MOUNTED_GETMNTINFO2], [1],
-	        [Define if there is a function named getmntinfo for reading the
+                [Define if there is a function named getmntinfo for reading the
                  list of mounted file systems and it returns an array of
                  'struct statvfs'.  (NetBSD 3.0)])
     fi
@@ -294,7 +294,7 @@ if test -z "$ac_list_mounted_fs"; then
   AC_MSG_CHECKING([for BEOS mounted file system support functions])
   if test $ac_cv_header_fs_info_h = yes \
       && test $ac_cv_func_next_dev = yes \
-	&& test $ac_cv_func_fs_stat_dev = yes; then
+        && test $ac_cv_func_fs_stat_dev = yes; then
     fu_result=yes
   else
     fu_result=no
@@ -319,7 +319,7 @@ if test -z "$ac_list_mounted_fs"; then
   if test $fu_cv_sys_mounted_fread = yes; then
     ac_list_mounted_fs=found
     AC_DEFINE([MOUNTED_FREAD], [1],
-	      [Define if there is no specific function for reading the list of
+              [Define if there is no specific function for reading the list of
                mounted file systems.  fread will be used to read /etc/mnttab.
                (SVR2) ])
   fi
diff --git a/m4/lseek.m4 b/m4/lseek.m4
index f336990709..b40da70a2c 100644
--- a/m4/lseek.m4
+++ b/m4/lseek.m4
@@ -19,21 +19,21 @@ int main ()
   /* Exit with success only if stdin is seekable.  */
   return lseek (0, (off_t)0, SEEK_CUR) < 0;
 }],
-	 [if test -s conftest$ac_exeext \
-	     && ./conftest$ac_exeext < conftest.$ac_ext \
-	     && { echo hi | ./conftest$ac_exeext; test $? = 1; }; then
-	    gl_cv_func_lseek_pipe=yes
-	  else
-	    gl_cv_func_lseek_pipe=no
-	  fi],
-	 [gl_cv_func_lseek_pipe=no])
+         [if test -s conftest$ac_exeext \
+             && ./conftest$ac_exeext < conftest.$ac_ext \
+             && { echo hi | ./conftest$ac_exeext; test $? = 1; }; then
+            gl_cv_func_lseek_pipe=yes
+          else
+            gl_cv_func_lseek_pipe=no
+          fi],
+         [gl_cv_func_lseek_pipe=no])
      else
        AC_COMPILE_IFELSE([
 #if ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) || defined __BEOS__
 /* mingw and BeOS mistakenly return 0 when trying to seek on pipes.  */
   Choke me.
 #endif],
-	 [gl_cv_func_lseek_pipe=yes], [gl_cv_func_lseek_pipe=no])
+         [gl_cv_func_lseek_pipe=yes], [gl_cv_func_lseek_pipe=no])
      fi])
   if test $gl_cv_func_lseek_pipe = no; then
     gl_REPLACE_LSEEK
@@ -46,5 +46,5 @@ AC_DEFUN([gl_REPLACE_LSEEK],
   AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
   REPLACE_LSEEK=1
   AC_DEFINE([LSEEK_PIPE_BROKEN], [1],
-	    [Define to 1 if lseek does not detect pipes.])
+            [Define to 1 if lseek does not detect pipes.])
 ])
diff --git a/m4/math_h.m4 b/m4/math_h.m4
index d941bc3347..50ce817a5b 100644
--- a/m4/math_h.m4
+++ b/m4/math_h.m4
@@ -15,9 +15,9 @@ AC_DEFUN([gl_MATH_H],
         test only needs to fail when NAN is provided but wrong.  */
          float f = 1.0f;
 #ifdef NAN
-	 f = NAN;
+         f = NAN;
 #endif
-	 return f == 0;]])],
+         return f == 0;]])],
       [gl_cv_header_math_nan_works=yes],
       [gl_cv_header_math_nan_works=no])])
   if test $gl_cv_header_math_nan_works = no; then
@@ -26,8 +26,8 @@ AC_DEFUN([gl_MATH_H],
   AC_CACHE_CHECK([whether HUGE_VAL works], [gl_cv_header_math_huge_val_works],
     [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <math.h>]],
       [[/* Solaris 10 has a broken definition of HUGE_VAL.  */
-	 double d = HUGE_VAL;
-	 return d == 0;]])],
+         double d = HUGE_VAL;
+         return d == 0;]])],
       [gl_cv_header_math_huge_val_works=yes],
       [gl_cv_header_math_huge_val_works=no])])
   if test $gl_cv_header_math_huge_val_works = no; then
diff --git a/m4/mbstate_t.m4 b/m4/mbstate_t.m4
index d4ec6f0fc7..08f85d6a56 100644
--- a/m4/mbstate_t.m4
+++ b/m4/mbstate_t.m4
@@ -18,17 +18,17 @@ AC_DEFUN([AC_TYPE_MBSTATE_T],
 
    AC_CACHE_CHECK([for mbstate_t], [ac_cv_type_mbstate_t],
      [AC_COMPILE_IFELSE(
-	[AC_LANG_PROGRAM(
-	   [AC_INCLUDES_DEFAULT[
-#	    include <wchar.h>]],
-	   [[mbstate_t x; return sizeof x;]])],
-	[ac_cv_type_mbstate_t=yes],
-	[ac_cv_type_mbstate_t=no])])
+        [AC_LANG_PROGRAM(
+           [AC_INCLUDES_DEFAULT[
+#           include <wchar.h>]],
+           [[mbstate_t x; return sizeof x;]])],
+        [ac_cv_type_mbstate_t=yes],
+        [ac_cv_type_mbstate_t=no])])
    if test $ac_cv_type_mbstate_t = yes; then
      AC_DEFINE([HAVE_MBSTATE_T], [1],
-	       [Define to 1 if <wchar.h> declares mbstate_t.])
+               [Define to 1 if <wchar.h> declares mbstate_t.])
    else
      AC_DEFINE([mbstate_t], [int],
-	       [Define to a type if <wchar.h> does not define.])
+               [Define to a type if <wchar.h> does not define.])
    fi
 ])
diff --git a/m4/memchr.m4 b/m4/memchr.m4
index 1194bac2e8..81531ca419 100644
--- a/m4/memchr.m4
+++ b/m4/memchr.m4
@@ -53,11 +53,11 @@ AC_DEFUN_ONCE([gl_FUNC_MEMCHR],
     {
       int pagesize = getpagesize ();
       char *two_pages =
-	(char *) mmap (NULL, 2 * pagesize, PROT_READ | PROT_WRITE,
-		       flags, fd, 0);
+        (char *) mmap (NULL, 2 * pagesize, PROT_READ | PROT_WRITE,
+                       flags, fd, 0);
       if (two_pages != (char *)(-1)
-	  && mprotect (two_pages + pagesize, pagesize, PROT_NONE) == 0)
-	fence = two_pages + pagesize;
+          && mprotect (two_pages + pagesize, pagesize, PROT_NONE) == 0)
+        fence = two_pages + pagesize;
     }
 #endif
   if (fence)
diff --git a/m4/memcmp.m4 b/m4/memcmp.m4
index 171f4144f7..f3600ff502 100644
--- a/m4/memcmp.m4
+++ b/m4/memcmp.m4
@@ -13,10 +13,10 @@ AC_DEFUN([gl_FUNC_MEMCMP],
     AC_CACHE_CHECK([whether cross-compiling target has memcmp],
                    [ac_cv_func_memcmp_working],
                    [AC_LINK_IFELSE([
-			AC_LANG_PROGRAM([[#include <string.h>
-				]], [[int ret = memcmp ("foo", "bar", 0);]])],
-			[ac_cv_func_memcmp_working=yes],
-			[ac_cv_func_memcmp_working=no])])
+                        AC_LANG_PROGRAM([[#include <string.h>
+                                ]], [[int ret = memcmp ("foo", "bar", 0);]])],
+                        [ac_cv_func_memcmp_working=yes],
+                        [ac_cv_func_memcmp_working=no])])
   fi
   AC_FUNC_MEMCMP
   dnl Note: AC_FUNC_MEMCMP does AC_LIBOBJ([memcmp]).
diff --git a/m4/memmem.m4 b/m4/memmem.m4
index 9e3d3d956d..3ef638516d 100644
--- a/m4/memmem.m4
+++ b/m4/memmem.m4
@@ -42,19 +42,19 @@ AC_DEFUN([gl_FUNC_MEMMEM],
     /* Check for quadratic performance.  */
     if (haystack && needle)
       {
-	memset (haystack, 'A', 2 * m);
-	haystack[2 * m] = 'B';
-	memset (needle, 'A', m);
-	needle[m] = 'B';
-	result = memmem (haystack, 2 * m + 1, needle, m + 1);
+        memset (haystack, 'A', 2 * m);
+        haystack[2 * m] = 'B';
+        memset (needle, 'A', m);
+        needle[m] = 'B';
+        result = memmem (haystack, 2 * m + 1, needle, m + 1);
       }
     /* Check for empty needle behavior.  */
     return !result || !memmem ("a", 1, 0, 0);]])],
-	[gl_cv_func_memmem_works=yes], [gl_cv_func_memmem_works=no],
-	[dnl Only glibc >= 2.9 and cygwin >= 1.7.0 are known to have a
-	 dnl memmem that works in linear time.
-	 AC_EGREP_CPP([Lucky user],
-	   [
+        [gl_cv_func_memmem_works=yes], [gl_cv_func_memmem_works=no],
+        [dnl Only glibc >= 2.9 and cygwin >= 1.7.0 are known to have a
+         dnl memmem that works in linear time.
+         AC_EGREP_CPP([Lucky user],
+           [
 #include <features.h>
 #ifdef __GNU_LIBRARY__
  #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9) || (__GLIBC__ > 2)
@@ -67,10 +67,10 @@ AC_DEFUN([gl_FUNC_MEMMEM],
   Lucky user
  #endif
 #endif
-	   ],
-	   [gl_cv_func_memmem_works=yes],
-	   [gl_cv_func_memmem_works="guessing no"])
-	])
+           ],
+           [gl_cv_func_memmem_works=yes],
+           [gl_cv_func_memmem_works="guessing no"])
+        ])
       ])
     if test "$gl_cv_func_memmem_works" != yes; then
       REPLACE_MEMMEM=1
diff --git a/m4/mkstemp.m4 b/m4/mkstemp.m4
index 20d8a1b701..b40060e0e5 100644
--- a/m4/mkstemp.m4
+++ b/m4/mkstemp.m4
@@ -21,25 +21,25 @@ AC_DEFUN([gl_FUNC_MKSTEMP],
     [
       mkdir conftest.mkstemp
       AC_RUN_IFELSE(
-	[AC_LANG_PROGRAM(
-	  [AC_INCLUDES_DEFAULT],
-	  [[int i;
-	    off_t large = (off_t) 4294967295u;
-	    if (large < 0)
-	      large = 2147483647;
-	    for (i = 0; i < 70; i++)
-	      {
-		char templ[] = "conftest.mkstemp/coXXXXXX";
-		int (*mkstemp_function) (char *) = mkstemp;
-		int fd = mkstemp_function (templ);
-		if (fd < 0 || lseek (fd, large, SEEK_SET) != large)
-		  return 1;
-		close (fd);
-	      }
-	    return 0;]])],
-	[gl_cv_func_working_mkstemp=yes],
-	[gl_cv_func_working_mkstemp=no],
-	[gl_cv_func_working_mkstemp=no])
+        [AC_LANG_PROGRAM(
+          [AC_INCLUDES_DEFAULT],
+          [[int i;
+            off_t large = (off_t) 4294967295u;
+            if (large < 0)
+              large = 2147483647;
+            for (i = 0; i < 70; i++)
+              {
+                char templ[] = "conftest.mkstemp/coXXXXXX";
+                int (*mkstemp_function) (char *) = mkstemp;
+                int fd = mkstemp_function (templ);
+                if (fd < 0 || lseek (fd, large, SEEK_SET) != large)
+                  return 1;
+                close (fd);
+              }
+            return 0;]])],
+        [gl_cv_func_working_mkstemp=yes],
+        [gl_cv_func_working_mkstemp=no],
+        [gl_cv_func_working_mkstemp=no])
       rm -rf conftest.mkstemp
     ])
 
diff --git a/m4/mktime.m4 b/m4/mktime.m4
index d3e99f990a..bea8782559 100644
--- a/m4/mktime.m4
+++ b/m4/mktime.m4
@@ -85,8 +85,8 @@ static int
 mktime_test (time_t now)
 {
   return (mktime_test1 (now)
-	  && mktime_test1 ((time_t) (time_t_max - now))
-	  && mktime_test1 ((time_t) (time_t_min + now)));
+          && mktime_test1 ((time_t) (time_t_max - now))
+          && mktime_test1 ((time_t) (time_t_min + now)));
 }
 
 static int
@@ -116,17 +116,17 @@ bigtime_test (int j)
     {
       struct tm *lt = localtime (&now);
       if (! (lt
-	     && lt->tm_year == tm.tm_year
-	     && lt->tm_mon == tm.tm_mon
-	     && lt->tm_mday == tm.tm_mday
-	     && lt->tm_hour == tm.tm_hour
-	     && lt->tm_min == tm.tm_min
-	     && lt->tm_sec == tm.tm_sec
-	     && lt->tm_yday == tm.tm_yday
-	     && lt->tm_wday == tm.tm_wday
-	     && ((lt->tm_isdst < 0 ? -1 : 0 < lt->tm_isdst)
-		  == (tm.tm_isdst < 0 ? -1 : 0 < tm.tm_isdst))))
-	return 0;
+             && lt->tm_year == tm.tm_year
+             && lt->tm_mon == tm.tm_mon
+             && lt->tm_mday == tm.tm_mday
+             && lt->tm_hour == tm.tm_hour
+             && lt->tm_min == tm.tm_min
+             && lt->tm_sec == tm.tm_sec
+             && lt->tm_yday == tm.tm_yday
+             && lt->tm_wday == tm.tm_wday
+             && ((lt->tm_isdst < 0 ? -1 : 0 < lt->tm_isdst)
+                  == (tm.tm_isdst < 0 ? -1 : 0 < tm.tm_isdst))))
+        return 0;
     }
   return 1;
 }
@@ -158,7 +158,7 @@ year_2050_test ()
      to the correct answer that we can assume the discrepancy is
      due to leap seconds.  */
   return (t == (time_t) -1
-	  || (0 < t && answer - 120 <= t && t <= answer + 120));
+          || (0 < t && answer - 120 <= t && t <= answer + 120));
 }
 
 int
@@ -176,7 +176,7 @@ main ()
     {
       t = (time_t_max << 1) + 1;
       if (t <= time_t_max)
-	break;
+        break;
       time_t_max = t;
     }
   time_t_min = - ((time_t) ~ (time_t) 0 == (time_t) -1) - time_t_max;
@@ -185,29 +185,29 @@ main ()
   for (i = 0; i < N_STRINGS; i++)
     {
       if (tz_strings[i])
-	putenv (tz_strings[i]);
+        putenv (tz_strings[i]);
 
       for (t = 0; t <= time_t_max - delta; t += delta)
-	if (! mktime_test (t))
-	  return 1;
+        if (! mktime_test (t))
+          return 1;
       if (! (mktime_test ((time_t) 1)
-	     && mktime_test ((time_t) (60 * 60))
-	     && mktime_test ((time_t) (60 * 60 * 24))))
-	return 1;
+             && mktime_test ((time_t) (60 * 60))
+             && mktime_test ((time_t) (60 * 60 * 24))))
+        return 1;
 
       for (j = 1; ; j <<= 1)
-	if (! bigtime_test (j))
-	  return 1;
-	else if (INT_MAX / 2 < j)
-	  break;
+        if (! bigtime_test (j))
+          return 1;
+        else if (INT_MAX / 2 < j)
+          break;
       if (! bigtime_test (INT_MAX))
-	return 1;
+        return 1;
     }
   return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ());
 }]])],
-	       [ac_cv_func_working_mktime=yes],
-	       [ac_cv_func_working_mktime=no],
-	       [ac_cv_func_working_mktime=no])])
+               [ac_cv_func_working_mktime=yes],
+               [ac_cv_func_working_mktime=no],
+               [ac_cv_func_working_mktime=no])])
 if test $ac_cv_func_working_mktime = no; then
   AC_LIBOBJ([mktime])
 fi
diff --git a/m4/mountlist.m4 b/m4/mountlist.m4
index f62c57a23b..985ff84ee5 100644
--- a/m4/mountlist.m4
+++ b/m4/mountlist.m4
@@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is preserved.
 AC_DEFUN([gl_MOUNTLIST],
 [
   gl_LIST_MOUNTED_FILE_SYSTEMS([gl_cv_list_mounted_fs=yes],
-			       [gl_cv_list_mounted_fs=no])
+                               [gl_cv_list_mounted_fs=no])
   if test $gl_cv_list_mounted_fs = yes; then
     AC_LIBOBJ([mountlist])
     gl_PREREQ_MOUNTLIST_EXTRA
diff --git a/m4/nanosleep.m4 b/m4/nanosleep.m4
index 2251e935e7..15df31a3d5 100644
--- a/m4/nanosleep.m4
+++ b/m4/nanosleep.m4
@@ -44,51 +44,51 @@ AC_DEFUN([gl_FUNC_NANOSLEEP],
   [
    AC_RUN_IFELSE(
      [AC_LANG_SOURCE([[
-	#include <errno.h>
-	#include <limits.h>
-	#include <signal.h>
-	#if HAVE_SYS_TIME_H
-	 #include <sys/time.h>
-	#endif
-	#include <time.h>
-	#include <unistd.h>
-	#define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
-	#define TYPE_MAXIMUM(t) \
-	  ((t) (! TYPE_SIGNED (t) \
-		? (t) -1 \
-		: ~ (~ (t) 0 << (sizeof (t) * CHAR_BIT - 1))))
+        #include <errno.h>
+        #include <limits.h>
+        #include <signal.h>
+        #if HAVE_SYS_TIME_H
+         #include <sys/time.h>
+        #endif
+        #include <time.h>
+        #include <unistd.h>
+        #define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
+        #define TYPE_MAXIMUM(t) \
+          ((t) (! TYPE_SIGNED (t) \
+                ? (t) -1 \
+                : ~ (~ (t) 0 << (sizeof (t) * CHAR_BIT - 1))))
 
-	static void
-	check_for_SIGALRM (int sig)
-	{
-	  if (sig != SIGALRM)
-	    _exit (1);
-	}
+        static void
+        check_for_SIGALRM (int sig)
+        {
+          if (sig != SIGALRM)
+            _exit (1);
+        }
 
-	int
-	main ()
-	{
-	  static struct timespec ts_sleep;
-	  static struct timespec ts_remaining;
-	  static struct sigaction act;
-	  if (! nanosleep)
-	    return 1;
-	  act.sa_handler = check_for_SIGALRM;
-	  sigemptyset (&act.sa_mask);
-	  sigaction (SIGALRM, &act, NULL);
-	  ts_sleep.tv_sec = 0;
-	  ts_sleep.tv_nsec = 1;
-	  alarm (1);
-	  if (nanosleep (&ts_sleep, NULL) != 0)
-	    return 1;
-	  ts_sleep.tv_sec = TYPE_MAXIMUM (time_t);
-	  ts_sleep.tv_nsec = 999999999;
-	  alarm (1);
-	  if (nanosleep (&ts_sleep, &ts_remaining) == -1 && errno == EINTR
-	      && TYPE_MAXIMUM (time_t) - 10 < ts_remaining.tv_sec)
-	    return 0;
-	  return 119;
-	}]])],
+        int
+        main ()
+        {
+          static struct timespec ts_sleep;
+          static struct timespec ts_remaining;
+          static struct sigaction act;
+          if (! nanosleep)
+            return 1;
+          act.sa_handler = check_for_SIGALRM;
+          sigemptyset (&act.sa_mask);
+          sigaction (SIGALRM, &act, NULL);
+          ts_sleep.tv_sec = 0;
+          ts_sleep.tv_nsec = 1;
+          alarm (1);
+          if (nanosleep (&ts_sleep, NULL) != 0)
+            return 1;
+          ts_sleep.tv_sec = TYPE_MAXIMUM (time_t);
+          ts_sleep.tv_nsec = 999999999;
+          alarm (1);
+          if (nanosleep (&ts_sleep, &ts_remaining) == -1 && errno == EINTR
+              && TYPE_MAXIMUM (time_t) - 10 < ts_remaining.tv_sec)
+            return 0;
+          return 119;
+        }]])],
      [gl_cv_func_nanosleep=yes],
      [case $? in dnl (
       119) gl_cv_func_nanosleep='no (mishandles large arguments)';; dnl (
@@ -102,7 +102,7 @@ AC_DEFUN([gl_FUNC_NANOSLEEP],
     REPLACE_NANOSLEEP=1
     if test "$gl_cv_func_nanosleep" = 'no (mishandles large arguments)'; then
       AC_DEFINE([HAVE_BUG_BIG_NANOSLEEP], [1],
-	[Define to 1 if nanosleep mishandles large arguments.])
+        [Define to 1 if nanosleep mishandles large arguments.])
     else
       for ac_lib in $LIBSOCKET; do
         case " $LIB_NANOSLEEP " in
diff --git a/m4/openat.m4 b/m4/openat.m4
index e6ea25ea64..8e2f67195b 100644
--- a/m4/openat.m4
+++ b/m4/openat.m4
@@ -74,7 +74,7 @@ AC_DEFUN([gl_FUNC_FCHOWNAT_DEREF_BUG],
      ln -s conftest.no-such $gl_dangle
      AC_RUN_IFELSE(
        [AC_LANG_SOURCE(
-	  [[
+          [[
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdlib.h>
@@ -84,10 +84,10 @@ int
 main ()
 {
   return (fchownat (AT_FDCWD, "$gl_dangle", -1, getgid (),
-		    AT_SYMLINK_NOFOLLOW) != 0
-	  && errno == ENOENT);
+                    AT_SYMLINK_NOFOLLOW) != 0
+          && errno == ENOENT);
 }
-	  ]])],
+          ]])],
     [gl_cv_func_fchownat_nofollow_works=yes],
     [gl_cv_func_fchownat_nofollow_works=no],
     [gl_cv_func_fchownat_nofollow_works=no],
diff --git a/m4/openmp.m4 b/m4/openmp.m4
index 116e6ce619..254511570e 100644
--- a/m4/openmp.m4
+++ b/m4/openmp.m4
@@ -61,30 +61,30 @@ AC_DEFUN([AC_OPENMP],
     AC_CACHE_CHECK([for $CC option to support OpenMP],
       [ac_cv_prog_[]_AC_LANG_ABBREV[]_openmp],
       [AC_LINK_IFELSE([_AC_LANG_OPENMP],
-	 [ac_cv_prog_[]_AC_LANG_ABBREV[]_openmp='none needed'],
-	 [ac_cv_prog_[]_AC_LANG_ABBREV[]_openmp='unsupported'
-	  dnl Try these flags:
-	  dnl   GCC >= 4.2           -fopenmp
-	  dnl   SunPRO C             -xopenmp
-	  dnl   Intel C              -openmp
-	  dnl   SGI C, PGI C         -mp
-	  dnl   Tru64 Compaq C       -omp
-	  dnl   IBM C (AIX, Linux)   -qsmp=omp
-	  dnl If in this loop a compiler is passed an option that it doesn't
-	  dnl understand or that it misinterprets, the AC_LINK_IFELSE test
-	  dnl will fail (since we know that it failed without the option),
-	  dnl therefore the loop will continue searching for an option, and
-	  dnl no output file called 'penmp' or 'mp' is created.
-	  for ac_option in -fopenmp -xopenmp -openmp -mp -omp -qsmp=omp; do
-	    ac_save_[]_AC_LANG_PREFIX[]FLAGS=$[]_AC_LANG_PREFIX[]FLAGS
-	    _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $ac_option"
-	    AC_LINK_IFELSE([_AC_LANG_OPENMP],
-	      [ac_cv_prog_[]_AC_LANG_ABBREV[]_openmp=$ac_option])
-	    _AC_LANG_PREFIX[]FLAGS=$ac_save_[]_AC_LANG_PREFIX[]FLAGS
-	    if test "$ac_cv_prog_[]_AC_LANG_ABBREV[]_openmp" != unsupported; then
-	      break
-	    fi
-	  done])])
+         [ac_cv_prog_[]_AC_LANG_ABBREV[]_openmp='none needed'],
+         [ac_cv_prog_[]_AC_LANG_ABBREV[]_openmp='unsupported'
+          dnl Try these flags:
+          dnl   GCC >= 4.2           -fopenmp
+          dnl   SunPRO C             -xopenmp
+          dnl   Intel C              -openmp
+          dnl   SGI C, PGI C         -mp
+          dnl   Tru64 Compaq C       -omp
+          dnl   IBM C (AIX, Linux)   -qsmp=omp
+          dnl If in this loop a compiler is passed an option that it doesn't
+          dnl understand or that it misinterprets, the AC_LINK_IFELSE test
+          dnl will fail (since we know that it failed without the option),
+          dnl therefore the loop will continue searching for an option, and
+          dnl no output file called 'penmp' or 'mp' is created.
+          for ac_option in -fopenmp -xopenmp -openmp -mp -omp -qsmp=omp; do
+            ac_save_[]_AC_LANG_PREFIX[]FLAGS=$[]_AC_LANG_PREFIX[]FLAGS
+            _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $ac_option"
+            AC_LINK_IFELSE([_AC_LANG_OPENMP],
+              [ac_cv_prog_[]_AC_LANG_ABBREV[]_openmp=$ac_option])
+            _AC_LANG_PREFIX[]FLAGS=$ac_save_[]_AC_LANG_PREFIX[]FLAGS
+            if test "$ac_cv_prog_[]_AC_LANG_ABBREV[]_openmp" != unsupported; then
+              break
+            fi
+          done])])
     case $ac_cv_prog_[]_AC_LANG_ABBREV[]_openmp in #(
       "none needed" | unsupported)
         ;; #(
diff --git a/m4/physmem.m4 b/m4/physmem.m4
index 9f93fa9bfc..96e7edc82d 100644
--- a/m4/physmem.m4
+++ b/m4/physmem.m4
@@ -8,19 +8,19 @@ dnl with or without modifications, as long as this notice is preserved.
 # a struct with member `physmem'.
 AC_DEFUN([gl_SYS__SYSTEM_CONFIGURATION],
   [AC_CACHE_CHECK([for external symbol _system_configuration],
-		  gl_cv_var__system_configuration,
+                  gl_cv_var__system_configuration,
     [AC_LINK_IFELSE([AC_LANG_PROGRAM(
-		      [[#include <sys/systemcfg.h>
-		      ]],
-		      [[double x = _system_configuration.physmem;
-		        if (x > 0.0) return 0;]])],
+                      [[#include <sys/systemcfg.h>
+                      ]],
+                      [[double x = _system_configuration.physmem;
+                        if (x > 0.0) return 0;]])],
       [gl_cv_var__system_configuration=yes],
       [gl_cv_var__system_configuration=no])])
 
     if test $gl_cv_var__system_configuration = yes; then
       AC_DEFINE([HAVE__SYSTEM_CONFIGURATION], [1],
-		[Define to 1 if you have the external variable,
-		_system_configuration with a member named physmem.])
+                [Define to 1 if you have the external variable,
+                _system_configuration with a member named physmem.])
     fi
   ]
 )
diff --git a/m4/po.m4 b/m4/po.m4
index 2284fa5054..1c35791827 100644
--- a/m4/po.m4
+++ b/m4/po.m4
@@ -411,8 +411,8 @@ changequote([,])dnl
       frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
       cat >> "$ac_file.tmp" <<EOF
 $frobbedlang.msg: $lang.po
-	@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
-	\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
+        @echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
+        \$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
 EOF
     done
   fi
@@ -422,8 +422,8 @@ EOF
       frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
       cat >> "$ac_file.tmp" <<EOF
 $frobbedlang/\$(DOMAIN).resources.dll: $lang.po
-	@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
-	\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
+        @echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
+        \$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
 EOF
     done
   fi
diff --git a/m4/posix-shell.m4 b/m4/posix-shell.m4
index 4c56193c15..d4ddad96ee 100644
--- a/m4/posix-shell.m4
+++ b/m4/posix-shell.m4
@@ -17,22 +17,22 @@ AC_DEFUN([gl_POSIX_SHELL],
   AC_CACHE_CHECK([for a shell that conforms to POSIX], [gl_cv_posix_shell],
     [gl_test_posix_shell_script='
        func_return () {
-	 (exit [$]1)
+         (exit [$]1)
        }
        func_success () {
-	 func_return 0
+         func_return 0
        }
        func_failure () {
-	 func_return 1
+         func_return 1
        }
        func_ret_success () {
-	 return 0
+         return 0
        }
        func_ret_failure () {
-	 return 1
+         return 1
        }
        subshell_umask_sanity () {
-	 (umask 22; (umask 0); test $(umask) -eq 22)
+         (umask 22; (umask 0); test $(umask) -eq 22)
        }
        test "[$](echo foo)" = foo &&
        func_success &&
@@ -43,11 +43,11 @@ AC_DEFUN([gl_POSIX_SHELL],
        subshell_umask_sanity
      '
      for gl_cv_posix_shell in \
-	 "$CONFIG_SHELL" "$SHELL" /bin/sh /bin/bash /bin/ksh /bin/sh5 no; do
+         "$CONFIG_SHELL" "$SHELL" /bin/sh /bin/bash /bin/ksh /bin/sh5 no; do
        case $gl_cv_posix_shell in
          /*)
-	   "$gl_cv_posix_shell" -c "$gl_test_posix_shell_script" 2>/dev/null \
-	     && break;;
+           "$gl_cv_posix_shell" -c "$gl_test_posix_shell_script" 2>/dev/null \
+             && break;;
        esac
      done])
 
diff --git a/m4/posix_spawn.m4 b/m4/posix_spawn.m4
index acf122de17..099843745c 100644
--- a/m4/posix_spawn.m4
+++ b/m4/posix_spawn.m4
@@ -158,18 +158,18 @@ main ()
           || (err = posix_spawnp (&child, CHILD_PROGRAM_FILENAME, &actions, &attrs, argv, environ)) != 0))
     {
       if (actions_allocated)
-	posix_spawn_file_actions_destroy (&actions);
+        posix_spawn_file_actions_destroy (&actions);
       if (attrs_allocated)
-	posix_spawnattr_destroy (&attrs);
+        posix_spawnattr_destroy (&attrs);
       sigprocmask (SIG_UNBLOCK, &fatal_signal_set, NULL);
       if (err == ENOENT)
-	return 0;
+        return 0;
       else
-	{
-	  errno = err;
-	  perror ("subprocess failed");
-	  exit (1);
-	}
+        {
+          errno = err;
+          perror ("subprocess failed");
+          exit (1);
+        }
     }
   posix_spawn_file_actions_destroy (&actions);
   posix_spawnattr_destroy (&attrs);
diff --git a/m4/pthread.m4 b/m4/pthread.m4
index 2a383076be..c984e2dfb0 100644
--- a/m4/pthread.m4
+++ b/m4/pthread.m4
@@ -13,8 +13,8 @@ AC_DEFUN([gl_PTHREAD_CHECK],
      gl_saved_libs=$LIBS
      AC_SEARCH_LIBS([pthread_create], [pthread],
        [if test "$ac_cv_search_pthread_create" != "none required"; then
-	  LIB_PTHREAD="$ac_cv_search_pthread_create"
-	fi])
+          LIB_PTHREAD="$ac_cv_search_pthread_create"
+        fi])
      LIBS="$gl_saved_libs"
    else
      PTHREAD_H='pthread.h'
diff --git a/m4/pty.m4 b/m4/pty.m4
index ba6a8c02a4..4670f31eb1 100644
--- a/m4/pty.m4
+++ b/m4/pty.m4
@@ -22,7 +22,7 @@ AC_DEFUN([gl_PTY],
         AC_MSG_WARN([[Cannot find forkpty, build will likely fail]])
       else
         PTY_H='pty.h'
-	PTY_HEADER='libutil.h'
+        PTY_HEADER='libutil.h'
       fi
     else
       PTY_H='pty.h'
diff --git a/m4/putenv.m4 b/m4/putenv.m4
index 120f5a4a52..e04f864906 100644
--- a/m4/putenv.m4
+++ b/m4/putenv.m4
@@ -28,11 +28,11 @@ AC_DEFUN([gl_FUNC_PUTENV],
       return 1;
 
     return 0;
-	      ]])],
-	     gl_cv_func_svid_putenv=yes,
-	     gl_cv_func_svid_putenv=no,
-	     dnl When crosscompiling, assume putenv is broken.
-	     gl_cv_func_svid_putenv=no)
+              ]])],
+             gl_cv_func_svid_putenv=yes,
+             gl_cv_func_svid_putenv=no,
+             dnl When crosscompiling, assume putenv is broken.
+             gl_cv_func_svid_putenv=no)
    ])
   if test $gl_cv_func_svid_putenv = no; then
     REPLACE_PUTENV=1
diff --git a/m4/readline.m4 b/m4/readline.m4
index eb44b0ad03..4230ce92b8 100644
--- a/m4/readline.m4
+++ b/m4/readline.m4
@@ -42,7 +42,7 @@ AC_DEFUN([gl_FUNC_READLINE],
           [[readline((char*)0);]])],
         [gl_cv_lib_readline=" -l$extra_lib"])
       if test "$gl_cv_lib_readline" != no; then
-	break
+        break
       fi
     done
     LIBS="$am_save_LIBS"
diff --git a/m4/regex.m4 b/m4/regex.m4
index aef53d2986..fee2f45a0a 100644
--- a/m4/regex.m4
+++ b/m4/regex.m4
@@ -18,146 +18,146 @@ AC_DEFUN([gl_REGEX],
 
   AC_ARG_WITH([included-regex],
     [AS_HELP_STRING([--without-included-regex],
-		    [don't compile regex; this is the default on systems
-		     with recent-enough versions of the GNU C Library
-		     (use with caution on other systems).])])
+                    [don't compile regex; this is the default on systems
+                     with recent-enough versions of the GNU C Library
+                     (use with caution on other systems).])])
 
   case $with_included_regex in #(
   yes|no) ac_use_included_regex=$with_included_regex
-	;;
+        ;;
   '')
     # If the system regex support is good enough that it passes the
     # following run test, then default to *not* using the included regex.c.
     # If cross compiling, assume the test would fail and use the included
     # regex.c.
     AC_CACHE_CHECK([for working re_compile_pattern],
-		   [gl_cv_func_re_compile_pattern_working],
+                   [gl_cv_func_re_compile_pattern_working],
       [AC_RUN_IFELSE(
-	[AC_LANG_PROGRAM(
-	  [AC_INCLUDES_DEFAULT[
-	   #if HAVE_LOCALE_H
-	    #include <locale.h>
-	   #endif
-	   #include <limits.h>
-	   #include <regex.h>
-	   ]],
-	  [[static struct re_pattern_buffer regex;
-	    unsigned char folded_chars[UCHAR_MAX + 1];
-	    int i;
-	    const char *s;
-	    struct re_registers regs;
-
-	    #if HAVE_LOCALE_H
-	      /* http://sourceware.org/ml/libc-hacker/2006-09/msg00008.html
-		 This test needs valgrind to catch the bug on Debian
-		 GNU/Linux 3.1 x86, but it might catch the bug better
-		 on other platforms and it shouldn't hurt to try the
-		 test here.  */
-	      if (setlocale (LC_ALL, "en_US.UTF-8"))
-		{
-		  static char const pat[] = "insert into";
-		  static char const data[] =
-		    "\xFF\0\x12\xA2\xAA\xC4\xB1,K\x12\xC4\xB1*\xACK";
-		  re_set_syntax (RE_SYNTAX_GREP | RE_HAT_LISTS_NOT_NEWLINE
-				 | RE_ICASE);
-		  memset (&regex, 0, sizeof regex);
-		  s = re_compile_pattern (pat, sizeof pat - 1, &regex);
-		  if (s)
-		    return 1;
-		  if (re_search (&regex, data, sizeof data - 1,
-				 0, sizeof data - 1, &regs)
-		      != -1)
-		    return 1;
-		  if (! setlocale (LC_ALL, "C"))
-		    return 1;
-		}
-	    #endif
-
-	    /* This test is from glibc bug 3957, reported by Andrew Mackey.  */
-	    re_set_syntax (RE_SYNTAX_EGREP | RE_HAT_LISTS_NOT_NEWLINE);
-	    memset (&regex, 0, sizeof regex);
-	    s = re_compile_pattern ("a[^x]b", 6, &regex);
-	    if (s)
-	      return 1;
-
-	    /* This should fail, but succeeds for glibc-2.5.  */
-	    if (re_search (&regex, "a\nb", 3, 0, 3, &regs) != -1)
-	      return 1;
-
-	    /* This regular expression is from Spencer ere test number 75
-	       in grep-2.3.  */
-	    re_set_syntax (RE_SYNTAX_POSIX_EGREP);
-	    memset (&regex, 0, sizeof regex);
-	    for (i = 0; i <= UCHAR_MAX; i++)
-	      folded_chars[i] = i;
-	    regex.translate = folded_chars;
-	    s = re_compile_pattern ("a[[:@:>@:]]b\n", 11, &regex);
-	    /* This should fail with _Invalid character class name_ error.  */
-	    if (!s)
-	      return 1;
-
-	    /* This should succeed, but does not for glibc-2.1.3.  */
-	    memset (&regex, 0, sizeof regex);
-	    s = re_compile_pattern ("{1", 2, &regex);
-
-	    if (s)
-	      return 1;
-
-	    /* The following example is derived from a problem report
-	       against gawk from Jorge Stolfi <stolfi@ic.unicamp.br>.  */
-	    memset (&regex, 0, sizeof regex);
-	    s = re_compile_pattern ("[an\371]*n", 7, &regex);
-	    if (s)
-	      return 1;
-
-	    /* This should match, but does not for glibc-2.2.1.  */
-	    if (re_match (&regex, "an", 2, 0, &regs) != 2)
-	      return 1;
-
-	    memset (&regex, 0, sizeof regex);
-	    s = re_compile_pattern ("x", 1, &regex);
-	    if (s)
-	      return 1;
-
-	    /* glibc-2.2.93 does not work with a negative RANGE argument.  */
-	    if (re_search (&regex, "wxy", 3, 2, -2, &regs) != 1)
-	      return 1;
-
-	    /* The version of regex.c in older versions of gnulib
-	       ignored RE_ICASE.  Detect that problem too.  */
-	    re_set_syntax (RE_SYNTAX_EMACS | RE_ICASE);
-	    memset (&regex, 0, sizeof regex);
-	    s = re_compile_pattern ("x", 1, &regex);
-	    if (s)
-	      return 1;
-
-	    if (re_search (&regex, "WXY", 3, 0, 3, &regs) < 0)
-	      return 1;
-
-	    /* Catch a bug reported by Vin Shelton in
-	       http://lists.gnu.org/archive/html/bug-coreutils/2007-06/msg00089.html
-	       */
-	    re_set_syntax (RE_SYNTAX_POSIX_BASIC
-			   & ~RE_CONTEXT_INVALID_DUP
-			   & ~RE_NO_EMPTY_RANGES);
-	    memset (&regex, 0, sizeof regex);
-	    s = re_compile_pattern ("[[:alnum:]_-]\\\\+$", 16, &regex);
-	    if (s)
-	      return 1;
-
-	    /* REG_STARTEND was added to glibc on 2004-01-15.
-	       Reject older versions.  */
-	    if (! REG_STARTEND)
-	      return 1;
-
-	    /* Reject hosts whose regoff_t values are too narrow.
-	       These include glibc 2.3.5 on hosts with 64-bit ptrdiff_t
-	       and 32-bit int.  */
-	    if (sizeof (regoff_t) < sizeof (ptrdiff_t)
-		|| sizeof (regoff_t) < sizeof (ssize_t))
-	      return 1;
-
-	    return 0;]])],
+        [AC_LANG_PROGRAM(
+          [AC_INCLUDES_DEFAULT[
+           #if HAVE_LOCALE_H
+            #include <locale.h>
+           #endif
+           #include <limits.h>
+           #include <regex.h>
+           ]],
+          [[static struct re_pattern_buffer regex;
+            unsigned char folded_chars[UCHAR_MAX + 1];
+            int i;
+            const char *s;
+            struct re_registers regs;
+
+            #if HAVE_LOCALE_H
+              /* http://sourceware.org/ml/libc-hacker/2006-09/msg00008.html
+                 This test needs valgrind to catch the bug on Debian
+                 GNU/Linux 3.1 x86, but it might catch the bug better
+                 on other platforms and it shouldn't hurt to try the
+                 test here.  */
+              if (setlocale (LC_ALL, "en_US.UTF-8"))
+                {
+                  static char const pat[] = "insert into";
+                  static char const data[] =
+                    "\xFF\0\x12\xA2\xAA\xC4\xB1,K\x12\xC4\xB1*\xACK";
+                  re_set_syntax (RE_SYNTAX_GREP | RE_HAT_LISTS_NOT_NEWLINE
+                                 | RE_ICASE);
+                  memset (&regex, 0, sizeof regex);
+                  s = re_compile_pattern (pat, sizeof pat - 1, &regex);
+                  if (s)
+                    return 1;
+                  if (re_search (&regex, data, sizeof data - 1,
+                                 0, sizeof data - 1, &regs)
+                      != -1)
+                    return 1;
+                  if (! setlocale (LC_ALL, "C"))
+                    return 1;
+                }
+            #endif
+
+            /* This test is from glibc bug 3957, reported by Andrew Mackey.  */
+            re_set_syntax (RE_SYNTAX_EGREP | RE_HAT_LISTS_NOT_NEWLINE);
+            memset (&regex, 0, sizeof regex);
+            s = re_compile_pattern ("a[^x]b", 6, &regex);
+            if (s)
+              return 1;
+
+            /* This should fail, but succeeds for glibc-2.5.  */
+            if (re_search (&regex, "a\nb", 3, 0, 3, &regs) != -1)
+              return 1;
+
+            /* This regular expression is from Spencer ere test number 75
+               in grep-2.3.  */
+            re_set_syntax (RE_SYNTAX_POSIX_EGREP);
+            memset (&regex, 0, sizeof regex);
+            for (i = 0; i <= UCHAR_MAX; i++)
+              folded_chars[i] = i;
+            regex.translate = folded_chars;
+            s = re_compile_pattern ("a[[:@:>@:]]b\n", 11, &regex);
+            /* This should fail with _Invalid character class name_ error.  */
+            if (!s)
+              return 1;
+
+            /* This should succeed, but does not for glibc-2.1.3.  */
+            memset (&regex, 0, sizeof regex);
+            s = re_compile_pattern ("{1", 2, &regex);
+
+            if (s)
+              return 1;
+
+            /* The following example is derived from a problem report
+               against gawk from Jorge Stolfi <stolfi@ic.unicamp.br>.  */
+            memset (&regex, 0, sizeof regex);
+            s = re_compile_pattern ("[an\371]*n", 7, &regex);
+            if (s)
+              return 1;
+
+            /* This should match, but does not for glibc-2.2.1.  */
+            if (re_match (&regex, "an", 2, 0, &regs) != 2)
+              return 1;
+
+            memset (&regex, 0, sizeof regex);
+            s = re_compile_pattern ("x", 1, &regex);
+            if (s)
+              return 1;
+
+            /* glibc-2.2.93 does not work with a negative RANGE argument.  */
+            if (re_search (&regex, "wxy", 3, 2, -2, &regs) != 1)
+              return 1;
+
+            /* The version of regex.c in older versions of gnulib
+               ignored RE_ICASE.  Detect that problem too.  */
+            re_set_syntax (RE_SYNTAX_EMACS | RE_ICASE);
+            memset (&regex, 0, sizeof regex);
+            s = re_compile_pattern ("x", 1, &regex);
+            if (s)
+              return 1;
+
+            if (re_search (&regex, "WXY", 3, 0, 3, &regs) < 0)
+              return 1;
+
+            /* Catch a bug reported by Vin Shelton in
+               http://lists.gnu.org/archive/html/bug-coreutils/2007-06/msg00089.html
+               */
+            re_set_syntax (RE_SYNTAX_POSIX_BASIC
+                           & ~RE_CONTEXT_INVALID_DUP
+                           & ~RE_NO_EMPTY_RANGES);
+            memset (&regex, 0, sizeof regex);
+            s = re_compile_pattern ("[[:alnum:]_-]\\\\+$", 16, &regex);
+            if (s)
+              return 1;
+
+            /* REG_STARTEND was added to glibc on 2004-01-15.
+               Reject older versions.  */
+            if (! REG_STARTEND)
+              return 1;
+
+            /* Reject hosts whose regoff_t values are too narrow.
+               These include glibc 2.3.5 on hosts with 64-bit ptrdiff_t
+               and 32-bit int.  */
+            if (sizeof (regoff_t) < sizeof (ptrdiff_t)
+                || sizeof (regoff_t) < sizeof (ssize_t))
+              return 1;
+
+            return 0;]])],
        [gl_cv_func_re_compile_pattern_working=yes],
        [gl_cv_func_re_compile_pattern_working=no],
        dnl When crosscompiling, assume it is not working.
diff --git a/m4/rmdir-errno.m4 b/m4/rmdir-errno.m4
index b7398bc873..de37f57683 100644
--- a/m4/rmdir-errno.m4
+++ b/m4/rmdir-errno.m4
@@ -25,17 +25,17 @@ AC_DEFUN([gl_FUNC_RMDIR_NOTEMPTY],
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
-	int main ()
-	{
-	  FILE *s;
-	  int val;
-	  rmdir ("confdir2");
-	  val = errno;
-	  s = fopen ("confdir2/errno", "w");
-	  fprintf (s, "%d\n", val);
-	  return 0;
-	}
-	]])],
+        int main ()
+        {
+          FILE *s;
+          int val;
+          rmdir ("confdir2");
+          val = errno;
+          s = fopen ("confdir2/errno", "w");
+          fprintf (s, "%d\n", val);
+          return 0;
+        }
+        ]])],
       [gl_cv_func_rmdir_errno_not_empty=`cat confdir2/errno`],
       [gl_cv_func_rmdir_errno_not_empty='configure error in rmdir-errno.m4'],
       [gl_cv_func_rmdir_errno_not_empty=ENOTEMPTY]
diff --git a/m4/rmdir.m4 b/m4/rmdir.m4
index 599b789578..ed338dd4a0 100644
--- a/m4/rmdir.m4
+++ b/m4/rmdir.m4
@@ -16,10 +16,10 @@ AC_DEFUN([gl_FUNC_RMDIR],
     # a bug report to inform us about it.
     if test x"$SKIP_RMDIR_CHECK" != xyes; then
       AC_MSG_FAILURE([Your system lacks the rmdir function.
-	      Please report this, along with the output of "uname -a", to the
-	      bug-coreutils@gnu.org mailing list.  To continue past this point,
-	      rerun configure with SKIP_RMDIR_CHECK=yes.
-	      E.g., ./configure SKIP_RMDIR_CHECK=yes])
+              Please report this, along with the output of "uname -a", to the
+              bug-coreutils@gnu.org mailing list.  To continue past this point,
+              rerun configure with SKIP_RMDIR_CHECK=yes.
+              E.g., ./configure SKIP_RMDIR_CHECK=yes])
     fi
   else
     dnl Detect cygwin 1.5.x bug.
diff --git a/m4/selinux-context-h.m4 b/m4/selinux-context-h.m4
index 6b0bed16ae..4d6197517c 100644
--- a/m4/selinux-context-h.m4
+++ b/m4/selinux-context-h.m4
@@ -10,7 +10,7 @@
 AC_DEFUN([gl_HEADERS_SELINUX_CONTEXT_H],
 [
   AC_CHECK_HEADERS([selinux/context.h],
-		   [SELINUX_CONTEXT_H=],
-		   [SELINUX_CONTEXT_H=selinux/context.h])
+                   [SELINUX_CONTEXT_H=],
+                   [SELINUX_CONTEXT_H=selinux/context.h])
   AC_SUBST([SELINUX_CONTEXT_H])
 ])
diff --git a/m4/selinux-selinux-h.m4 b/m4/selinux-selinux-h.m4
index 767c4f7f1b..6eb41796de 100644
--- a/m4/selinux-selinux-h.m4
+++ b/m4/selinux-selinux-h.m4
@@ -20,11 +20,11 @@ AC_DEFUN([gl_HEADERS_SELINUX_SELINUX_H],
     AC_LIBOBJ([getfilecon])
     gl_CHECK_NEXT_HEADERS([selinux/selinux.h])
     AC_DEFINE([getfilecon], [rpl_getfilecon],
-	      [Always use our getfilecon wrapper.])
+              [Always use our getfilecon wrapper.])
     AC_DEFINE([lgetfilecon], [rpl_lgetfilecon],
-	      [Always use our lgetfilecon wrapper.])
+              [Always use our lgetfilecon wrapper.])
     AC_DEFINE([fgetfilecon], [rpl_fgetfilecon],
-	      [Always use our fgetfilecon wrapper.])
+              [Always use our fgetfilecon wrapper.])
   fi
 
   case "$ac_cv_search_setfilecon:$ac_cv_header_selinux_selinux_h" in
diff --git a/m4/socklen.m4 b/m4/socklen.m4
index 80ed5135fd..36436ed80b 100644
--- a/m4/socklen.m4
+++ b/m4/socklen.m4
@@ -20,30 +20,30 @@ AC_DEFUN([gl_TYPE_SOCKLEN_T],
    AC_CHECK_TYPE([socklen_t], ,
      [AC_MSG_CHECKING([for socklen_t equivalent])
       AC_CACHE_VAL([gl_cv_socklen_t_equiv],
-	[# Systems have either "struct sockaddr *" or
-	 # "void *" as the second argument to getpeername
-	 gl_cv_socklen_t_equiv=
-	 for arg2 in "struct sockaddr" void; do
-	   for t in int size_t "unsigned int" "long int" "unsigned long int"; do
-	     AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+        [# Systems have either "struct sockaddr *" or
+         # "void *" as the second argument to getpeername
+         gl_cv_socklen_t_equiv=
+         for arg2 in "struct sockaddr" void; do
+           for t in int size_t "unsigned int" "long int" "unsigned long int"; do
+             AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
                  [[#include <sys/types.h>
                    #include <sys/socket.h>
 
                    int getpeername (int, $arg2 *, $t *);]],
                  [[$t len;
                   getpeername (0, 0, &len);]])],
-	       [gl_cv_socklen_t_equiv="$t"])
-	     test "$gl_cv_socklen_t_equiv" != "" && break
-	   done
-	   test "$gl_cv_socklen_t_equiv" != "" && break
-	 done
+               [gl_cv_socklen_t_equiv="$t"])
+             test "$gl_cv_socklen_t_equiv" != "" && break
+           done
+           test "$gl_cv_socklen_t_equiv" != "" && break
+         done
       ])
       if test "$gl_cv_socklen_t_equiv" = ""; then
-	AC_MSG_ERROR([Cannot find a type to use in place of socklen_t])
+        AC_MSG_ERROR([Cannot find a type to use in place of socklen_t])
       fi
       AC_MSG_RESULT([$gl_cv_socklen_t_equiv])
       AC_DEFINE_UNQUOTED([socklen_t], [$gl_cv_socklen_t_equiv],
-	[type to use in place of socklen_t if not defined])],
+        [type to use in place of socklen_t if not defined])],
      [#include <sys/types.h>
       #if HAVE_SYS_SOCKET_H
       # include <sys/socket.h>
diff --git a/m4/st_dm_mode.m4 b/m4/st_dm_mode.m4
index 641858cd67..8ac433bcdd 100644
--- a/m4/st_dm_mode.m4
+++ b/m4/st_dm_mode.m4
@@ -17,7 +17,7 @@ AC_DEFUN([AC_STRUCT_ST_DM_MODE],
 
   if test $ac_cv_struct_st_dm_mode = yes; then
     AC_DEFINE([HAVE_ST_DM_MODE], [1],
-	      [Define if struct stat has an st_dm_mode member. ])
+              [Define if struct stat has an st_dm_mode member. ])
   fi
  ]
 )
diff --git a/m4/stat-time.m4 b/m4/stat-time.m4
index cdef9d1356..efcca6cdfd 100644
--- a/m4/stat-time.m4
+++ b/m4/stat-time.m4
@@ -27,35 +27,35 @@ AC_DEFUN([gl_STAT_TIME],
     [AC_CACHE_CHECK([whether struct stat.st_atim is of type struct timespec],
        [ac_cv_typeof_struct_stat_st_atim_is_struct_timespec],
        [AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-	  [[
-	    #include <sys/types.h>
-	    #include <sys/stat.h>
-	    #if HAVE_SYS_TIME_H
-	    # include <sys/time.h>
-	    #endif
-	    #include <time.h>
-	    struct timespec ts;
-	    struct stat st;
-	  ]],
-	  [[
-	    st.st_atim = ts;
-	  ]])],
-	  [ac_cv_typeof_struct_stat_st_atim_is_struct_timespec=yes],
-	  [ac_cv_typeof_struct_stat_st_atim_is_struct_timespec=no])])
+          [[
+            #include <sys/types.h>
+            #include <sys/stat.h>
+            #if HAVE_SYS_TIME_H
+            # include <sys/time.h>
+            #endif
+            #include <time.h>
+            struct timespec ts;
+            struct stat st;
+          ]],
+          [[
+            st.st_atim = ts;
+          ]])],
+          [ac_cv_typeof_struct_stat_st_atim_is_struct_timespec=yes],
+          [ac_cv_typeof_struct_stat_st_atim_is_struct_timespec=no])])
      if test $ac_cv_typeof_struct_stat_st_atim_is_struct_timespec = yes; then
        AC_DEFINE([TYPEOF_STRUCT_STAT_ST_ATIM_IS_STRUCT_TIMESPEC], [1],
-	 [Define to 1 if the type of the st_atim member of a struct stat is
-	  struct timespec.])
+         [Define to 1 if the type of the st_atim member of a struct stat is
+          struct timespec.])
      fi],
     [AC_CHECK_MEMBERS([struct stat.st_atimespec.tv_nsec], [],
        [AC_CHECK_MEMBERS([struct stat.st_atimensec], [],
-	  [AC_CHECK_MEMBERS([struct stat.st_atim.st__tim.tv_nsec], [], [],
-	     [#include <sys/types.h>
-	      #include <sys/stat.h>])],
-	  [#include <sys/types.h>
-	   #include <sys/stat.h>])],
+          [AC_CHECK_MEMBERS([struct stat.st_atim.st__tim.tv_nsec], [], [],
+             [#include <sys/types.h>
+              #include <sys/stat.h>])],
+          [#include <sys/types.h>
+           #include <sys/stat.h>])],
        [#include <sys/types.h>
-	#include <sys/stat.h>])],
+        #include <sys/stat.h>])],
     [#include <sys/types.h>
      #include <sys/stat.h>])
 ])
@@ -76,10 +76,10 @@ AC_DEFUN([gl_STAT_BIRTHTIME],
   AC_CHECK_MEMBERS([struct stat.st_birthtimespec.tv_nsec], [],
     [AC_CHECK_MEMBERS([struct stat.st_birthtimensec], [],
       [AC_CHECK_MEMBERS([struct stat.st_birthtim.tv_nsec], [], [],
-	 [#include <sys/types.h>
-	  #include <sys/stat.h>])],
+         [#include <sys/types.h>
+          #include <sys/stat.h>])],
        [#include <sys/types.h>
-	#include <sys/stat.h>])],
+        #include <sys/stat.h>])],
     [#include <sys/types.h>
      #include <sys/stat.h>])
 ])
diff --git a/m4/stdbool.m4 b/m4/stdbool.m4
index 57c804a80f..5e22d7a4b0 100644
--- a/m4/stdbool.m4
+++ b/m4/stdbool.m4
@@ -38,77 +38,77 @@ AC_DEFUN([AC_HEADER_STDBOOL],
   [AC_CACHE_CHECK([for stdbool.h that conforms to C99],
      [ac_cv_header_stdbool_h],
      [AC_TRY_COMPILE(
-	[
-	  #include <stdbool.h>
-	  #ifndef bool
-	   "error: bool is not defined"
-	  #endif
-	  #ifndef false
-	   "error: false is not defined"
-	  #endif
-	  #if false
-	   "error: false is not 0"
-	  #endif
-	  #ifndef true
-	   "error: true is not defined"
-	  #endif
-	  #if true != 1
-	   "error: true is not 1"
-	  #endif
-	  #ifndef __bool_true_false_are_defined
-	   "error: __bool_true_false_are_defined is not defined"
-	  #endif
+        [
+          #include <stdbool.h>
+          #ifndef bool
+           "error: bool is not defined"
+          #endif
+          #ifndef false
+           "error: false is not defined"
+          #endif
+          #if false
+           "error: false is not 0"
+          #endif
+          #ifndef true
+           "error: true is not defined"
+          #endif
+          #if true != 1
+           "error: true is not 1"
+          #endif
+          #ifndef __bool_true_false_are_defined
+           "error: __bool_true_false_are_defined is not defined"
+          #endif
 
-	  struct s { _Bool s: 1; _Bool t; } s;
+          struct s { _Bool s: 1; _Bool t; } s;
 
-	  char a[true == 1 ? 1 : -1];
-	  char b[false == 0 ? 1 : -1];
-	  char c[__bool_true_false_are_defined == 1 ? 1 : -1];
-	  char d[(bool) 0.5 == true ? 1 : -1];
-	  bool e = &s;
-	  char f[(_Bool) 0.0 == false ? 1 : -1];
-	  char g[true];
-	  char h[sizeof (_Bool)];
-	  char i[sizeof s.t];
-	  enum { j = false, k = true, l = false * true, m = true * 256 };
-	  _Bool n[m];
-	  char o[sizeof n == m * sizeof n[0] ? 1 : -1];
-	  char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
-	  #if defined __xlc__ || defined __GNUC__
-	   /* Catch a bug in IBM AIX xlc compiler version 6.0.0.0
-	      reported by James Lemley on 2005-10-05; see
-	      http://lists.gnu.org/archive/html/bug-coreutils/2005-10/msg00086.html
-	      This test is not quite right, since xlc is allowed to
-	      reject this program, as the initializer for xlcbug is
-	      not one of the forms that C requires support for.
-	      However, doing the test right would require a run-time
-	      test, and that would make cross-compilation harder.
-	      Let us hope that IBM fixes the xlc bug, and also adds
-	      support for this kind of constant expression.  In the
-	      meantime, this test will reject xlc, which is OK, since
-	      our stdbool.h substitute should suffice.  We also test
-	      this with GCC, where it should work, to detect more
-	      quickly whether someone messes up the test in the
-	      future.  */
-	   char digs[] = "0123456789";
-	   int xlcbug = 1 / (&(digs + 5)[-2 + (bool) 1] == &digs[4] ? 1 : -1);
-	  #endif
-	  /* Catch a bug in an HP-UX C compiler.  See
-	     http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
-	     http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
-	   */
-	  _Bool q = true;
-	  _Bool *pq = &q;
-	],
-	[
-	  *pq |= q;
-	  *pq |= ! q;
-	  /* Refer to every declared value, to avoid compiler optimizations.  */
-	  return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
-		  + !m + !n + !o + !p + !q + !pq);
-	],
-	[ac_cv_header_stdbool_h=yes],
-	[ac_cv_header_stdbool_h=no])])
+          char a[true == 1 ? 1 : -1];
+          char b[false == 0 ? 1 : -1];
+          char c[__bool_true_false_are_defined == 1 ? 1 : -1];
+          char d[(bool) 0.5 == true ? 1 : -1];
+          bool e = &s;
+          char f[(_Bool) 0.0 == false ? 1 : -1];
+          char g[true];
+          char h[sizeof (_Bool)];
+          char i[sizeof s.t];
+          enum { j = false, k = true, l = false * true, m = true * 256 };
+          _Bool n[m];
+          char o[sizeof n == m * sizeof n[0] ? 1 : -1];
+          char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
+          #if defined __xlc__ || defined __GNUC__
+           /* Catch a bug in IBM AIX xlc compiler version 6.0.0.0
+              reported by James Lemley on 2005-10-05; see
+              http://lists.gnu.org/archive/html/bug-coreutils/2005-10/msg00086.html
+              This test is not quite right, since xlc is allowed to
+              reject this program, as the initializer for xlcbug is
+              not one of the forms that C requires support for.
+              However, doing the test right would require a run-time
+              test, and that would make cross-compilation harder.
+              Let us hope that IBM fixes the xlc bug, and also adds
+              support for this kind of constant expression.  In the
+              meantime, this test will reject xlc, which is OK, since
+              our stdbool.h substitute should suffice.  We also test
+              this with GCC, where it should work, to detect more
+              quickly whether someone messes up the test in the
+              future.  */
+           char digs[] = "0123456789";
+           int xlcbug = 1 / (&(digs + 5)[-2 + (bool) 1] == &digs[4] ? 1 : -1);
+          #endif
+          /* Catch a bug in an HP-UX C compiler.  See
+             http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
+             http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
+           */
+          _Bool q = true;
+          _Bool *pq = &q;
+        ],
+        [
+          *pq |= q;
+          *pq |= ! q;
+          /* Refer to every declared value, to avoid compiler optimizations.  */
+          return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
+                  + !m + !n + !o + !p + !q + !pq);
+        ],
+        [ac_cv_header_stdbool_h=yes],
+        [ac_cv_header_stdbool_h=no])])
    AC_CHECK_TYPES([_Bool])
    if test $ac_cv_header_stdbool_h = yes; then
      AC_DEFINE([HAVE_STDBOOL_H], [1], [Define to 1 if stdbool.h conforms to C99.])
diff --git a/m4/stdint.m4 b/m4/stdint.m4
index a2e8bdd628..819d629e94 100644
--- a/m4/stdint.m4
+++ b/m4/stdint.m4
@@ -396,12 +396,12 @@ AC_DEFUN([gl_INTEGER_TYPE_SUFFIX],
        for glsuf in "$glsufu" ${glsufu}l ${glsufu}ll ${glsufu}i64; do
          case $glsuf in
            '')  gltype1='int';;
-           l)	gltype1='long int';;
-           ll)	gltype1='long long int';;
-           i64)	gltype1='__int64';;
-           u)	gltype1='unsigned int';;
-           ul)	gltype1='unsigned long int';;
-           ull)	gltype1='unsigned long long int';;
+           l)   gltype1='long int';;
+           ll)  gltype1='long long int';;
+           i64) gltype1='__int64';;
+           u)   gltype1='unsigned int';;
+           ul)  gltype1='unsigned long int';;
+           ull) gltype1='unsigned long long int';;
            ui64)gltype1='unsigned __int64';;
          esac
          AC_COMPILE_IFELSE(
diff --git a/m4/stdio_h.m4 b/m4/stdio_h.m4
index ed828eac89..256efe1cbd 100644
--- a/m4/stdio_h.m4
+++ b/m4/stdio_h.m4
@@ -140,6 +140,6 @@ AC_DEFUN([gl_STDIN_LARGE_OFFSET],
   choke me
 # endif
 #endif]])],
-	[gl_cv_var_stdin_large_offset=yes],
-	[gl_cv_var_stdin_large_offset=no])])
+        [gl_cv_var_stdin_large_offset=yes],
+        [gl_cv_var_stdin_large_offset=no])])
 ])
diff --git a/m4/strcasestr.m4 b/m4/strcasestr.m4
index 62991b1602..7a79990306 100644
--- a/m4/strcasestr.m4
+++ b/m4/strcasestr.m4
@@ -50,20 +50,20 @@ AC_DEFUN([gl_FUNC_STRCASESTR],
     /* Check for quadratic performance.  */
     if (haystack && needle)
       {
-	memset (haystack, 'A', 2 * m);
-	haystack[2 * m] = 'B';
-	haystack[2 * m + 1] = 0;
-	memset (needle, 'A', m);
-	needle[m] = 'B';
-	needle[m + 1] = 0;
-	result = strcasestr (haystack, needle);
+        memset (haystack, 'A', 2 * m);
+        haystack[2 * m] = 'B';
+        haystack[2 * m + 1] = 0;
+        memset (needle, 'A', m);
+        needle[m] = 'B';
+        needle[m + 1] = 0;
+        result = strcasestr (haystack, needle);
       }
     return !result;]])],
-	[gl_cv_func_strcasestr_linear=yes], [gl_cv_func_strcasestr_linear=no],
+        [gl_cv_func_strcasestr_linear=yes], [gl_cv_func_strcasestr_linear=no],
         [dnl Only glibc >= 2.9 and cygwin >= 1.7.0 are known to have a
          dnl strcasestr that works in linear time.
-	 AC_EGREP_CPP([Lucky user],
-	   [
+         AC_EGREP_CPP([Lucky user],
+           [
 #include <features.h>
 #ifdef __GNU_LIBRARY__
  #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9) || (__GLIBC__ > 2)
@@ -76,10 +76,10 @@ AC_DEFUN([gl_FUNC_STRCASESTR],
   Lucky user
  #endif
 #endif
-	   ],
-	   [gl_cv_func_strcasestr_linear=yes],
-	   [gl_cv_func_strcasestr_linear="guessing no"])
-	])
+           ],
+           [gl_cv_func_strcasestr_linear=yes],
+           [gl_cv_func_strcasestr_linear="guessing no"])
+        ])
       ])
     if test "$gl_cv_func_strcasestr_linear" != yes; then
       REPLACE_STRCASESTR=1
diff --git a/m4/string_h.m4 b/m4/string_h.m4
index edc5c6e825..e8705342ba 100644
--- a/m4/string_h.m4
+++ b/m4/string_h.m4
@@ -66,31 +66,31 @@ AC_DEFUN([gl_HEADER_STRING_H_DEFAULTS],
   GNULIB_STRSIGNAL=0;   AC_SUBST([GNULIB_STRSIGNAL])
   GNULIB_STRVERSCMP=0;   AC_SUBST([GNULIB_STRVERSCMP])
   dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_DECL_MEMMEM=1;		AC_SUBST([HAVE_DECL_MEMMEM])
-  HAVE_MEMPCPY=1;		AC_SUBST([HAVE_MEMPCPY])
-  HAVE_DECL_MEMRCHR=1;		AC_SUBST([HAVE_DECL_MEMRCHR])
-  HAVE_RAWMEMCHR=1;		AC_SUBST([HAVE_RAWMEMCHR])
-  HAVE_STPCPY=1;		AC_SUBST([HAVE_STPCPY])
-  HAVE_STPNCPY=1;		AC_SUBST([HAVE_STPNCPY])
-  HAVE_STRCHRNUL=1;		AC_SUBST([HAVE_STRCHRNUL])
-  HAVE_DECL_STRDUP=1;		AC_SUBST([HAVE_DECL_STRDUP])
-  HAVE_DECL_STRNDUP=1;		AC_SUBST([HAVE_DECL_STRNDUP])
-  HAVE_DECL_STRNLEN=1;		AC_SUBST([HAVE_DECL_STRNLEN])
-  HAVE_STRPBRK=1;		AC_SUBST([HAVE_STRPBRK])
-  HAVE_STRSEP=1;		AC_SUBST([HAVE_STRSEP])
-  HAVE_STRCASESTR=1;		AC_SUBST([HAVE_STRCASESTR])
-  HAVE_DECL_STRTOK_R=1;		AC_SUBST([HAVE_DECL_STRTOK_R])
-  HAVE_DECL_STRERROR=1;		AC_SUBST([HAVE_DECL_STRERROR])
-  HAVE_DECL_STRSIGNAL=1;	AC_SUBST([HAVE_DECL_STRSIGNAL])
-  HAVE_STRVERSCMP=1;		AC_SUBST([HAVE_STRVERSCMP])
-  REPLACE_MEMCHR=0;		AC_SUBST([REPLACE_MEMCHR])
-  REPLACE_MEMMEM=0;		AC_SUBST([REPLACE_MEMMEM])
-  REPLACE_STRDUP=0;		AC_SUBST([REPLACE_STRDUP])
-  REPLACE_STRSTR=0;		AC_SUBST([REPLACE_STRSTR])
-  REPLACE_STRCASESTR=0;		AC_SUBST([REPLACE_STRCASESTR])
-  REPLACE_STRERROR=0;		AC_SUBST([REPLACE_STRERROR])
-  REPLACE_STRNDUP=0;		AC_SUBST([REPLACE_STRNDUP])
-  REPLACE_STRSIGNAL=0;		AC_SUBST([REPLACE_STRSIGNAL])
-  REPLACE_STRTOK_R=0;		AC_SUBST([REPLACE_STRTOK_R])
-  UNDEFINE_STRTOK_R=0;		AC_SUBST([UNDEFINE_STRTOK_R])
+  HAVE_DECL_MEMMEM=1;           AC_SUBST([HAVE_DECL_MEMMEM])
+  HAVE_MEMPCPY=1;               AC_SUBST([HAVE_MEMPCPY])
+  HAVE_DECL_MEMRCHR=1;          AC_SUBST([HAVE_DECL_MEMRCHR])
+  HAVE_RAWMEMCHR=1;             AC_SUBST([HAVE_RAWMEMCHR])
+  HAVE_STPCPY=1;                AC_SUBST([HAVE_STPCPY])
+  HAVE_STPNCPY=1;               AC_SUBST([HAVE_STPNCPY])
+  HAVE_STRCHRNUL=1;             AC_SUBST([HAVE_STRCHRNUL])
+  HAVE_DECL_STRDUP=1;           AC_SUBST([HAVE_DECL_STRDUP])
+  HAVE_DECL_STRNDUP=1;          AC_SUBST([HAVE_DECL_STRNDUP])
+  HAVE_DECL_STRNLEN=1;          AC_SUBST([HAVE_DECL_STRNLEN])
+  HAVE_STRPBRK=1;               AC_SUBST([HAVE_STRPBRK])
+  HAVE_STRSEP=1;                AC_SUBST([HAVE_STRSEP])
+  HAVE_STRCASESTR=1;            AC_SUBST([HAVE_STRCASESTR])
+  HAVE_DECL_STRTOK_R=1;         AC_SUBST([HAVE_DECL_STRTOK_R])
+  HAVE_DECL_STRERROR=1;         AC_SUBST([HAVE_DECL_STRERROR])
+  HAVE_DECL_STRSIGNAL=1;        AC_SUBST([HAVE_DECL_STRSIGNAL])
+  HAVE_STRVERSCMP=1;            AC_SUBST([HAVE_STRVERSCMP])
+  REPLACE_MEMCHR=0;             AC_SUBST([REPLACE_MEMCHR])
+  REPLACE_MEMMEM=0;             AC_SUBST([REPLACE_MEMMEM])
+  REPLACE_STRDUP=0;             AC_SUBST([REPLACE_STRDUP])
+  REPLACE_STRSTR=0;             AC_SUBST([REPLACE_STRSTR])
+  REPLACE_STRCASESTR=0;         AC_SUBST([REPLACE_STRCASESTR])
+  REPLACE_STRERROR=0;           AC_SUBST([REPLACE_STRERROR])
+  REPLACE_STRNDUP=0;            AC_SUBST([REPLACE_STRNDUP])
+  REPLACE_STRSIGNAL=0;          AC_SUBST([REPLACE_STRSIGNAL])
+  REPLACE_STRTOK_R=0;           AC_SUBST([REPLACE_STRTOK_R])
+  UNDEFINE_STRTOK_R=0;          AC_SUBST([UNDEFINE_STRTOK_R])
 ])
diff --git a/m4/strndup.m4 b/m4/strndup.m4
index 437e7f650e..f8ea8f2ca7 100644
--- a/m4/strndup.m4
+++ b/m4/strndup.m4
@@ -22,7 +22,7 @@ AC_DEFUN([gl_FUNC_STRNDUP],
     AC_CACHE_CHECK([for working strndup], [gl_cv_func_strndup_works],
       [AC_RUN_IFELSE([
          AC_LANG_PROGRAM([[#include <string.h>
-			   #include <stdlib.h>]], [[
+                           #include <stdlib.h>]], [[
 #ifndef HAVE_DECL_STRNDUP
   extern char *strndup (const char *, size_t);
 #endif
diff --git a/m4/strsignal.m4 b/m4/strsignal.m4
index d71f0963fb..83213831c8 100644
--- a/m4/strsignal.m4
+++ b/m4/strsignal.m4
@@ -24,17 +24,17 @@ AC_DEFUN([gl_FUNC_STRSIGNAL],
     AC_CACHE_CHECK([whether strsignal always returns a string],
       [gl_cv_func_working_strsignal],
       [AC_RUN_IFELSE(
-	 [AC_LANG_PROGRAM(
-	    [[#include <string.h>
-	    ]],
-	    [[char *s = strsignal (-1);
-	      return !(s != (char *) 0 && s != (char *) -1);]])],
-	 [gl_cv_func_working_strsignal=yes],
-	 [gl_cv_func_working_strsignal=no],
-	 [case "$host_os" in
-	    solaris* | aix*) gl_cv_func_working_strsignal=no;;
-	    *)               gl_cv_func_working_strsignal="guessing yes";;
-	  esac])])
+         [AC_LANG_PROGRAM(
+            [[#include <string.h>
+            ]],
+            [[char *s = strsignal (-1);
+              return !(s != (char *) 0 && s != (char *) -1);]])],
+         [gl_cv_func_working_strsignal=yes],
+         [gl_cv_func_working_strsignal=no],
+         [case "$host_os" in
+            solaris* | aix*) gl_cv_func_working_strsignal=no;;
+            *)               gl_cv_func_working_strsignal="guessing yes";;
+          esac])])
   else
     gl_cv_func_working_strsignal=no
   fi
diff --git a/m4/strstr.m4 b/m4/strstr.m4
index b72df089fc..abca44fff9 100644
--- a/m4/strstr.m4
+++ b/m4/strstr.m4
@@ -38,13 +38,13 @@ AC_DEFUN([gl_FUNC_STRSTR],
     /* Check for quadratic performance.  */
     if (haystack && needle)
       {
-	memset (haystack, 'A', 2 * m);
-	haystack[2 * m] = 'B';
-	haystack[2 * m + 1] = 0;
-	memset (needle, 'A', m);
-	needle[m] = 'B';
-	needle[m + 1] = 0;
-	result = strstr (haystack, needle);
+        memset (haystack, 'A', 2 * m);
+        haystack[2 * m] = 'B';
+        haystack[2 * m + 1] = 0;
+        memset (needle, 'A', m);
+        needle[m] = 'B';
+        needle[m + 1] = 0;
+        result = strstr (haystack, needle);
       }
     return !result;]])],
         [gl_cv_func_strstr_linear=yes], [gl_cv_func_strstr_linear=no],
diff --git a/m4/strtod.m4 b/m4/strtod.m4
index 3bc8770258..72729d81c9 100644
--- a/m4/strtod.m4
+++ b/m4/strtod.m4
@@ -73,9 +73,9 @@ numeric_equal (double x, double y)
       return 1;
   }
 ]])],
-	[gl_cv_func_strtod_works=yes],
-	[gl_cv_func_strtod_works=no],
-	[gl_cv_func_strtod_works="guessing no"])])
+        [gl_cv_func_strtod_works=yes],
+        [gl_cv_func_strtod_works=no],
+        [gl_cv_func_strtod_works="guessing no"])])
     if test "$gl_cv_func_strtod_works" != yes; then
       REPLACE_STRTOD=1
       gl_PREREQ_STRTOD
diff --git a/m4/sys_select_h.m4 b/m4/sys_select_h.m4
index 0bb097e1a7..991c7b7428 100644
--- a/m4/sys_select_h.m4
+++ b/m4/sys_select_h.m4
@@ -17,7 +17,7 @@ AC_DEFUN([gl_HEADER_SYS_SELECT],
       dnl 2. On OSF/1 4.0, <sys/select.h> provides only a forward declaration
       dnl    of 'struct timeval', and no definition of this type.
       AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/select.h>]],
-					 [[struct timeval b;]])],
+                                         [[struct timeval b;]])],
         [gl_cv_header_sys_select_h_selfcontained=yes],
         [gl_cv_header_sys_select_h_selfcontained=no])
       dnl Test against another bug:
diff --git a/m4/sys_time_h.m4 b/m4/sys_time_h.m4
index 13ac5763b3..e2f7809fbc 100644
--- a/m4/sys_time_h.m4
+++ b/m4/sys_time_h.m4
@@ -30,12 +30,12 @@ AC_DEFUN([gl_HEADER_SYS_TIME_H_BODY],
   AC_CACHE_CHECK([for struct timeval], [gl_cv_sys_struct_timeval],
     [AC_COMPILE_IFELSE(
        [AC_LANG_PROGRAM(
-	  [[#if HAVE_SYS_TIME_H
-	     #include <sys/time.h>
-	    #endif
-	    #include <time.h>
-	  ]],
-	  [[static struct timeval x; x.tv_sec = x.tv_usec;]])],
+          [[#if HAVE_SYS_TIME_H
+             #include <sys/time.h>
+            #endif
+            #include <time.h>
+          ]],
+          [[static struct timeval x; x.tv_sec = x.tv_usec;]])],
        [gl_cv_sys_struct_timeval=yes],
        [gl_cv_sys_struct_timeval=no])])
   if test $gl_cv_sys_struct_timeval = yes; then
diff --git a/m4/time_h.m4 b/m4/time_h.m4
index 16fefa1974..c038b17616 100644
--- a/m4/time_h.m4
+++ b/m4/time_h.m4
@@ -45,9 +45,9 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_TIMESPEC],
     [gl_cv_sys_struct_timespec_in_time_h],
     [AC_COMPILE_IFELSE(
        [AC_LANG_PROGRAM(
-	  [[#include <time.h>
-	  ]],
-	  [[static struct timespec x; x.tv_sec = x.tv_nsec;]])],
+          [[#include <time.h>
+          ]],
+          [[static struct timespec x; x.tv_sec = x.tv_nsec;]])],
        [gl_cv_sys_struct_timespec_in_time_h=yes],
        [gl_cv_sys_struct_timespec_in_time_h=no])])
 
@@ -59,12 +59,12 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_TIMESPEC],
     AC_CACHE_CHECK([for struct timespec in <sys/time.h>],
       [gl_cv_sys_struct_timespec_in_sys_time_h],
       [AC_COMPILE_IFELSE(
-	 [AC_LANG_PROGRAM(
-	    [[#include <sys/time.h>
-	    ]],
-	    [[static struct timespec x; x.tv_sec = x.tv_nsec;]])],
-	 [gl_cv_sys_struct_timespec_in_sys_time_h=yes],
-	 [gl_cv_sys_struct_timespec_in_sys_time_h=no])])
+         [AC_LANG_PROGRAM(
+            [[#include <sys/time.h>
+            ]],
+            [[static struct timespec x; x.tv_sec = x.tv_nsec;]])],
+         [gl_cv_sys_struct_timespec_in_sys_time_h=yes],
+         [gl_cv_sys_struct_timespec_in_sys_time_h=no])])
     if test $gl_cv_sys_struct_timespec_in_sys_time_h = yes; then
       SYS_TIME_H_DEFINES_STRUCT_TIMESPEC=1
     fi
diff --git a/m4/timegm.m4 b/m4/timegm.m4
index be323c9b0f..f0fa0b6068 100644
--- a/m4/timegm.m4
+++ b/m4/timegm.m4
@@ -34,7 +34,7 @@ AC_DEFUN([gl_PREREQ_TIMEGM], [
        # so we need to substitute our own mktime implementation.
        AC_LIBOBJ([mktime])
        AC_DEFINE([mktime], [rpl_mktime],
-	 [Define to rpl_mktime if the replacement function should be used.])
+         [Define to rpl_mktime if the replacement function should be used.])
        gl_PREREQ_MKTIME])
   fi
 ])
diff --git a/m4/tzset.m4 b/m4/tzset.m4
index 4fed1fd7db..9c1b2a72dc 100644
--- a/m4/tzset.m4
+++ b/m4/tzset.m4
@@ -34,11 +34,11 @@ main ()
   putenv ("TZ=EST+3EDT+2,M10.1.0/00:00:00,M2.3.0/00:00:00");
   tzset ();
   return (p->tm_year != s.tm_year
-	  || p->tm_mon != s.tm_mon
-	  || p->tm_mday != s.tm_mday
-	  || p->tm_hour != s.tm_hour
-	  || p->tm_min != s.tm_min
-	  || p->tm_sec != s.tm_sec);
+          || p->tm_mon != s.tm_mon
+          || p->tm_mday != s.tm_mday
+          || p->tm_hour != s.tm_hour
+          || p->tm_min != s.tm_min
+          || p->tm_sec != s.tm_sec);
 }
   ]])],
        [gl_cv_func_tzset_clobber=no],
diff --git a/m4/ungetc.m4 b/m4/ungetc.m4
index eb652356b5..e2a3f1fff4 100644
--- a/m4/ungetc.m4
+++ b/m4/ungetc.m4
@@ -13,21 +13,21 @@ AC_DEFUN_ONCE([gl_FUNC_UNGETC_WORKS],
     [AC_RUN_IFELSE([AC_LANG_PROGRAM([[
 #include <stdio.h>
       ]], [FILE *f;
-	   if (!(f = fopen ("conftest.tmp", "w+"))) return 1;
-	   if (fputs ("abc", f) < 0) return 2;
-	   rewind (f);
-	   if (fgetc (f) != 'a') return 3;
-	   if (fgetc (f) != 'b') return 4;
-	   if (ungetc ('d', f) != 'd') return 5;
-	   if (ftell (f) != 1) return 6;
-	   if (fgetc (f) != 'd') return 7;
-	   if (ftell (f) != 2) return 8;
-	   if (fseek (f, 0, SEEK_CUR) != 0) return 9;
-	   if (ftell (f) != 2) return 10;
-	   if (fgetc (f) != 'c') return 11;
-	   fclose (f); remove ("conftest.tmp");])],
-	[gl_cv_func_ungetc_works=yes], [gl_cv_func_ungetc_works=no],
-	[gl_cv_func_ungetc_works='guessing no'])
+           if (!(f = fopen ("conftest.tmp", "w+"))) return 1;
+           if (fputs ("abc", f) < 0) return 2;
+           rewind (f);
+           if (fgetc (f) != 'a') return 3;
+           if (fgetc (f) != 'b') return 4;
+           if (ungetc ('d', f) != 'd') return 5;
+           if (ftell (f) != 1) return 6;
+           if (fgetc (f) != 'd') return 7;
+           if (ftell (f) != 2) return 8;
+           if (fseek (f, 0, SEEK_CUR) != 0) return 9;
+           if (ftell (f) != 2) return 10;
+           if (fgetc (f) != 'c') return 11;
+           fclose (f); remove ("conftest.tmp");])],
+        [gl_cv_func_ungetc_works=yes], [gl_cv_func_ungetc_works=no],
+        [gl_cv_func_ungetc_works='guessing no'])
     ])
   if test "$gl_cv_func_ungetc_works" != yes; then
     AC_DEFINE([FUNC_UNGETC_BROKEN], [1],
diff --git a/m4/unlink-busy.m4 b/m4/unlink-busy.m4
index a38eb707cf..ce7e1c92e3 100644
--- a/m4/unlink-busy.m4
+++ b/m4/unlink-busy.m4
@@ -17,11 +17,11 @@ AC_DEFUN([gl_FUNC_UNLINK_BUSY_TEXT],
       AC_RUN_IFELSE(
         [AC_LANG_SOURCE(
            [AC_INCLUDES_DEFAULT[
-	    int
-	    main (int argc, char **argv)
-	    {
-	      return !argc || unlink (argv[0]) != 0;
-	    }]])],
+            int
+            main (int argc, char **argv)
+            {
+              return !argc || unlink (argv[0]) != 0;
+            }]])],
       gl_cv_func_unlink_busy_text=yes,
       gl_cv_func_unlink_busy_text=no,
       gl_cv_func_unlink_busy_text=no
diff --git a/m4/uptime.m4 b/m4/uptime.m4
index d2fbd350ed..e018d71fc5 100644
--- a/m4/uptime.m4
+++ b/m4/uptime.m4
@@ -18,6 +18,6 @@ AC_DEFUN([gl_SYS_PROC_UPTIME],
       && gl_cv_have_proc_uptime=yes])
   if test $gl_cv_have_proc_uptime = yes; then
     AC_DEFINE([HAVE_PROC_UPTIME], [1],
-	      [  Define if your system has the /proc/uptime special file.])
+              [  Define if your system has the /proc/uptime special file.])
   fi
 ])
diff --git a/m4/utimbuf.m4 b/m4/utimbuf.m4
index 062f736275..8953abcb42 100644
--- a/m4/utimbuf.m4
+++ b/m4/utimbuf.m4
@@ -19,15 +19,15 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_UTIMBUF],
   AC_CACHE_CHECK([for struct utimbuf], [gl_cv_sys_struct_utimbuf],
     [AC_COMPILE_IFELSE(
        [AC_LANG_PROGRAM(
-	  [[#if HAVE_SYS_TIME_H
-	     #include <sys/time.h>
-	    #endif
-	    #include <time.h>
-	    #ifdef HAVE_UTIME_H
-	     #include <utime.h>
-	    #endif
-	  ]],
-	  [[static struct utimbuf x; x.actime = x.modtime;]])],
+          [[#if HAVE_SYS_TIME_H
+             #include <sys/time.h>
+            #endif
+            #include <time.h>
+            #ifdef HAVE_UTIME_H
+             #include <utime.h>
+            #endif
+          ]],
+          [[static struct utimbuf x; x.actime = x.modtime;]])],
        [gl_cv_sys_struct_utimbuf=yes],
        [gl_cv_sys_struct_utimbuf=no])])
 
diff --git a/m4/utime.m4 b/m4/utime.m4
index f090e7b048..7ad7f66580 100644
--- a/m4/utime.m4
+++ b/m4/utime.m4
@@ -38,23 +38,23 @@ AC_CACHE_CHECK([whether utime accepts a null argument], [ac_cv_func_utime_null],
 [rm -f conftest.data; >conftest.data
 # Sequent interprets utime(file, 0) to mean use start of epoch.  Wrong.
 AC_RUN_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT
-	       #ifdef HAVE_UTIME_H
-	       # include <utime.h>
-	       #endif],
+               #ifdef HAVE_UTIME_H
+               # include <utime.h>
+               #endif],
 [[struct stat s, t;
   return ! (stat ("conftest.data", &s) == 0
-	    && utime ("conftest.data", 0) == 0
-	    && stat ("conftest.data", &t) == 0
-	    && t.st_mtime >= s.st_mtime
-	    && t.st_mtime - s.st_mtime < 120);]])],
-	      ac_cv_func_utime_null=yes,
-	      ac_cv_func_utime_null=no,
-	      ac_cv_func_utime_null='guessing yes')])
+            && utime ("conftest.data", 0) == 0
+            && stat ("conftest.data", &t) == 0
+            && t.st_mtime >= s.st_mtime
+            && t.st_mtime - s.st_mtime < 120);]])],
+              ac_cv_func_utime_null=yes,
+              ac_cv_func_utime_null=no,
+              ac_cv_func_utime_null='guessing yes')])
 if test "x$ac_cv_func_utime_null" != xno; then
   ac_cv_func_utime_null=yes
   AC_DEFINE([HAVE_UTIME_NULL], [1],
-	    [Define to 1 if `utime(file, NULL)' sets file's timestamp to the
-	     present.])
+            [Define to 1 if `utime(file, NULL)' sets file's timestamp to the
+             present.])
 fi
 rm -f conftest.data
 ])
diff --git a/m4/utimes-null.m4 b/m4/utimes-null.m4
index 91976f1ded..9c9157f485 100644
--- a/m4/utimes-null.m4
+++ b/m4/utimes-null.m4
@@ -23,10 +23,10 @@ int
 main () {
 struct stat s, t;
 return ! (stat ("conftest.data", &s) == 0
-	  && utimes ("conftest.data", 0) == 0
-	  && stat ("conftest.data", &t) == 0
-	  && t.st_mtime >= s.st_mtime
-	  && t.st_mtime - s.st_mtime < 120));
+          && utimes ("conftest.data", 0) == 0
+          && stat ("conftest.data", &t) == 0
+          && t.st_mtime >= s.st_mtime
+          && t.st_mtime - s.st_mtime < 120));
 }]])],
   [ac_cv_func_utimes_null=yes],
   [ac_cv_func_utimes_null=no],
@@ -35,7 +35,7 @@ rm -f core core.* *.core])
 
     if test $ac_cv_func_utimes_null = yes; then
       AC_DEFINE([HAVE_UTIMES_NULL], [1],
-		[Define if utimes accepts a null argument])
+                [Define if utimes accepts a null argument])
     fi
   ]
 )
diff --git a/m4/utimes.m4 b/m4/utimes.m4
index 239a0dbe0a..ed7d6aaf56 100644
--- a/m4/utimes.m4
+++ b/m4/utimes.m4
@@ -21,7 +21,7 @@ dnl with or without modifications, as long as this notice is preserved.
 AC_DEFUN([gl_FUNC_UTIMES],
 [
   AC_CACHE_CHECK([whether the utimes function works],
-		 [gl_cv_func_working_utimes],
+                 [gl_cv_func_working_utimes],
   [
   AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <sys/types.h>
@@ -45,11 +45,11 @@ main ()
   int fd;
 
   int ok = ((f = fopen (file, "w"))
-	    && fclose (f) == 0
-	    && utimes (file, timeval) == 0
-	    && lstat (file, &sbuf) == 0
-	    && sbuf.st_atime == timeval[0].tv_sec
-	    && sbuf.st_mtime == timeval[1].tv_sec);
+            && fclose (f) == 0
+            && utimes (file, timeval) == 0
+            && lstat (file, &sbuf) == 0
+            && sbuf.st_atime == timeval[0].tv_sec
+            && sbuf.st_mtime == timeval[1].tv_sec);
   unlink (file);
   if (!ok)
     exit (1);
@@ -67,8 +67,8 @@ main ()
     exit (1);
 
   ok = (0 <= (fd = open (file, O_WRONLY|O_CREAT, 0444))
-	      && close (fd) == 0
-	      && utimes (file, NULL) == 0);
+              && close (fd) == 0
+              && utimes (file, NULL) == 0);
   unlink (file);
 
   exit (!ok);
diff --git a/m4/vararrays.m4 b/m4/vararrays.m4
index 65fb4d963b..5e2cb499f3 100644
--- a/m4/vararrays.m4
+++ b/m4/vararrays.m4
@@ -14,8 +14,8 @@ AC_DEFUN([AC_C_VARARRAYS],
   AC_CACHE_CHECK([for variable-length arrays],
     ac_cv_c_vararrays,
     [AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-	 [],
-	 [[static int x; char a[++x]; a[sizeof a - 1] = 0; return a[0];]])],
+         [],
+         [[static int x; char a[++x]; a[sizeof a - 1] = 0; return a[0];]])],
        ac_cv_c_vararrays=yes,
        ac_cv_c_vararrays=no)])
   if test $ac_cv_c_vararrays = yes; then
diff --git a/m4/version-etc.m4 b/m4/version-etc.m4
index 14d6eb6dce..87389de5f0 100644
--- a/m4/version-etc.m4
+++ b/m4/version-etc.m4
@@ -11,8 +11,8 @@ m4_define([gl_VERSION_ETC_FLAG],
   AC_ARG_WITH([$1], [AS_HELP_STRING([--with-$1], [$2])],
     [dnl
       case $withval in
-	yes|no) ;;
-	*) AC_DEFINE_UNQUOTED(AS_TR_CPP([PACKAGE_$1]), ["$withval"], [$2]) ;;
+        yes|no) ;;
+        *) AC_DEFINE_UNQUOTED(AS_TR_CPP([PACKAGE_$1]), ["$withval"], [$2]) ;;
       esac
     ])
 ])
@@ -20,11 +20,11 @@ m4_define([gl_VERSION_ETC_FLAG],
 AC_DEFUN([gl_VERSION_ETC],
 [dnl
   gl_VERSION_ETC_FLAG([packager],
-		      [String identifying the packager of this software])
+                      [String identifying the packager of this software])
   gl_VERSION_ETC_FLAG([packager-version],
-		      [Packager-specific version information])
+                      [Packager-specific version information])
   gl_VERSION_ETC_FLAG([packager-bug-reports],
-		      [Packager info for bug reports (URL/e-mail/...)])
+                      [Packager info for bug reports (URL/e-mail/...)])
   if test "X$with_packager" = "X" && \
      test "X$with_packager_version$with_packager_bug_reports" != "X"
   then
diff --git a/m4/warnings.m4 b/m4/warnings.m4
index c32cf4ed66..1639c0360e 100644
--- a/m4/warnings.m4
+++ b/m4/warnings.m4
@@ -33,7 +33,7 @@ AC_CACHE_CHECK([whether compiler handles $1], [gl_Warn], [
   CPPFLAGS="${CPPFLAGS} $1"
   AC_PREPROC_IFELSE([AC_LANG_PROGRAM([])],
                     [AS_VAR_SET([gl_Warn], [yes])],
-		    [AS_VAR_SET([gl_Warn], [no])])
+                    [AS_VAR_SET([gl_Warn], [no])])
   CPPFLAGS="$save_CPPFLAGS"
 ])
 AS_VAR_PUSHDEF([gl_Flags], m4_if([$2], [], [[WARN_CFLAGS]], [[$2]]))dnl