3 files changed, 30 insertions, 24 deletions

diff --git a/lib/afs.m4 b/lib/afs.m4
index 905ef42..9e7d773 100644
--- a/lib/afs.m4
+++ b/lib/afs.m4
@@ -1,12 +1,13 @@
-#serial 3
+#serial 5
 
-AC_DEFUN(jm_AFS,
-  AC_MSG_CHECKING(for AFS)
-  if test -d /afs; then
-    AC_DEFINE_UNQUOTED(AFS, 1, [Define if you have the Andrew File System.])
-    ac_result=yes
-  else
-    ac_result=no
-  fi
-  AC_MSG_RESULT($ac_result)
-)
+AC_DEFUN([jm_AFS],
+  [
+    AC_MSG_CHECKING(for AFS)
+    if test -d /afs; then
+      AC_DEFINE(AFS, 1, [Define if you have the Andrew File System.])
+      ac_result=yes
+    else
+      ac_result=no
+    fi
+    AC_MSG_RESULT($ac_result)
+  ])
diff --git a/lib/fstypename.m4 b/lib/fstypename.m4
index 70abc12..75723a1 100644
--- a/lib/fstypename.m4
+++ b/lib/fstypename.m4
@@ -1,4 +1,4 @@
-#serial 2
+#serial 3
 
 dnl From Jim Meyering.
 dnl
@@ -6,7 +6,7 @@ dnl See if struct statfs has the f_fstypename member.
 dnl If so, define HAVE_F_FSTYPENAME_IN_STATFS.
 dnl
 
-AC_DEFUN(jm_FSTYPENAME,
+AC_DEFUN([jm_FSTYPENAME],
   [
     AC_CACHE_CHECK([for f_fstypename in struct statfs],
                    fu_cv_sys_f_fstypename_in_statfs,
@@ -25,8 +25,8 @@ AC_DEFUN(jm_FSTYPENAME,
     )
 
     if test $fu_cv_sys_f_fstypename_in_statfs = yes; then
-      AC_DEFINE_UNQUOTED(HAVE_F_FSTYPENAME_IN_STATFS, 1,
-                         [Define if struct statfs has the f_fstypename member.])
+      AC_DEFINE(HAVE_F_FSTYPENAME_IN_STATFS, 1,
+                [Define if struct statfs has the f_fstypename member.])
     fi
   ]
 )
diff --git a/lib/fsusage.m4 b/lib/fsusage.m4
index d5c646f..85d0fc8 100644
--- a/lib/fsusage.m4
+++ b/lib/fsusage.m4
@@ -1,4 +1,4 @@
-#serial 7
+#serial 9
 
 # From fileutils/configure.in
 
@@ -8,7 +8,7 @@
 #
 # jm_FILE_SYSTEM_USAGE([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
 
-AC_DEFUN(jm_FILE_SYSTEM_USAGE,
+AC_DEFUN([jm_FILE_SYSTEM_USAGE],
 [
 
 echo "checking how to get filesystem space usage..."
@@ -24,13 +24,18 @@ if test $ac_fsusage_space = no; then
   # SVR4
   AC_CACHE_CHECK([for statvfs function (SVR4)], fu_cv_sys_stat_statvfs,
                  [AC_TRY_LINK([#include <sys/types.h>
+#ifdef __GLIBC__
+Do not use statvfs on systems with GNU libc, because that function stats
+all preceding entries in /proc/mounts, and that makes df hang if even
+one of the corresponding file systems is hard-mounted, but not available.
+#endif
 #include <sys/statvfs.h>],
                               [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_UNQUOTED(STAT_STATVFS, 1,
+    AC_DEFINE(STAT_STATVFS, 1,
               [  Define if there is a function named statvfs.  (SVR4)])
   fi
 fi
@@ -55,7 +60,7 @@ if test $ac_fsusage_space = no; then
   AC_MSG_RESULT($fu_cv_sys_stat_statfs3_osf1)
   if test $fu_cv_sys_stat_statfs3_osf1 = yes; then
     ac_fsusage_space=yes
-    AC_DEFINE_UNQUOTED(STAT_STATFS3_OSF1, 1,
+    AC_DEFINE(STAT_STATFS3_OSF1, 1,
               [   Define if  statfs takes 3 args.  (DEC Alpha running OSF/1)])
   fi
 fi
@@ -87,7 +92,7 @@ member (AIX, 4.3BSD)])
   AC_MSG_RESULT($fu_cv_sys_stat_statfs2_bsize)
   if test $fu_cv_sys_stat_statfs2_bsize = yes; then
     ac_fsusage_space=yes
-    AC_DEFINE_UNQUOTED(STAT_STATFS2_BSIZE, 1,
+    AC_DEFINE(STAT_STATFS2_BSIZE, 1,
 [  Define if statfs takes 2 args and struct statfs has a field named f_bsize.
    (4.3BSD, SunOS 4, HP-UX, AIX PS/2)])
   fi
@@ -110,7 +115,7 @@ if test $ac_fsusage_space = no; then
   AC_MSG_RESULT($fu_cv_sys_stat_statfs4)
   if test $fu_cv_sys_stat_statfs4 = yes; then
     ac_fsusage_space=yes
-    AC_DEFINE_UNQUOTED(STAT_STATFS4, 1,
+    AC_DEFINE(STAT_STATFS4, 1,
               [  Define if statfs takes 4 args.  (SVR3, Dynix, Irix, Dolphin)])
   fi
 fi
@@ -139,7 +144,7 @@ member (4.4BSD and NetBSD)])
   AC_MSG_RESULT($fu_cv_sys_stat_statfs2_fsize)
   if test $fu_cv_sys_stat_statfs2_fsize = yes; then
     ac_fsusage_space=yes
-    AC_DEFINE_UNQUOTED(STAT_STATFS2_FSIZE, 1,
+    AC_DEFINE(STAT_STATFS2_FSIZE, 1,
 [  Define if statfs takes 2 args and struct statfs has a field named f_fsize.
    (4.4BSD, NetBSD)])
   fi
@@ -172,7 +177,7 @@ if test $ac_fsusage_space = no; then
   AC_MSG_RESULT($fu_cv_sys_stat_fs_data)
   if test $fu_cv_sys_stat_fs_data = yes; then
     ac_fsusage_space=yes
-    AC_DEFINE_UNQUOTED(STAT_STATFS2_FS_DATA, 1,
+    AC_DEFINE(STAT_STATFS2_FS_DATA, 1,
 [  Define if statfs takes 2 args and the second argument has
    type struct fs_data.  (Ultrix)])
   fi
@@ -182,7 +187,7 @@ if test $ac_fsusage_space = no; then
   # SVR2
   AC_TRY_CPP([#include <sys/filsys.h>
     ],
-    AC_DEFINE_UNQUOTED(STAT_READ_FILSYS, 1,
+    AC_DEFINE(STAT_READ_FILSYS, 1,
       [Define if there is no specific function for reading filesystems usage
        information and you have the <sys/filsys.h> header file.  (SVR2)])
     ac_fsusage_space=yes)