Merge branch '4664_use_statvfs'

* 4664_use_statvfs:
  buildsys: move conditions to `m4` file for easier syncronization
  Ticket #4664: clarify USE_STATVFS definition.

Author: aborodin

m4.include/mc-get-fs-info.m4

@@ -58,6 +58,7 @@ AC_INCLUDES_DEFAULT
 # include <fs_info.h>
 #endif
 "
+  dnl Keep this long conditional in sync with the USE_STATVFS conditional below
   if case "$fu_cv_sys_stat_statvfs$fu_cv_sys_stat_statvfs64" in
        *yes*) ;; *) false;; esac &&
      { AC_CHECK_MEMBERS([struct statvfs.f_basetype],,, [$statvfs_includes])
@@ -68,7 +69,6 @@ AC_INCLUDES_DEFAULT
            { AC_CHECK_MEMBERS([struct statvfs.f_type],,, [$statvfs_includes])
              test $ac_cv_member_struct_statvfs_f_type = yes; }; }; }; }
   then
-    AC_CHECK_MEMBERS([struct statvfs.f_namemax],,, [$statvfs_includes])
     AC_COMPILE_IFELSE(
       [AC_LANG_PROGRAM(
          [$statvfs_includes],
@@ -89,6 +89,12 @@ AC_INCLUDES_DEFAULT
            [Define to 1 if the f_fsid member of struct statfs is an integer.])])
     fi
   fi
+  if test x"$fu_cv_sys_stat_statvfs" = xyes -o x"$fu_cv_sys_stat_statvfs64" = xyes && \
+      test x"$ac_cv_member_struct_statvfs_f_basetype" = xyes || \
+      test x"$ac_cv_member_struct_statvfs_f_fstypename" = xyes || \
+      test x"$ac_cv_member_struct_statvfs_f_fstypename" != xyes -a x"$ac_cv_member_struct_statvfs_f_type" = xyes ; then
+    AC_DEFINE([USE_STATVFS], [1], [Define to 1 if header <sys/statvfs.h> is usable])
+  fi
 ])
 
 

src/filemanager/filegui.c

@@ -52,14 +52,6 @@
 
 #include <config.h>
 
-#if ((defined STAT_STATVFS || defined STAT_STATVFS64)                                              \
-     && (defined HAVE_STRUCT_STATVFS_F_BASETYPE || defined HAVE_STRUCT_STATVFS_F_FSTYPENAME        \
-         || (!defined HAVE_STRUCT_STATFS_F_FSTYPENAME)))
-#define USE_STATVFS 1
-#else
-#define USE_STATVFS 0
-#endif
-
 #include <errno.h>
 #include <ctype.h>
 #include <limits.h>  // INT_MAX
@@ -68,7 +60,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#if USE_STATVFS
+#if defined(USE_STATVFS)
 #include <sys/statvfs.h>
 #elif defined HAVE_SYS_VFS_H
 #include <sys/vfs.h>
@@ -83,7 +75,7 @@
 #include <fs_info.h>
 #endif
 
-#if USE_STATVFS
+#if defined(USE_STATVFS)
 #if !defined STAT_STATVFS && defined STAT_STATVFS64
 #define STRUCT_STATVFS struct statvfs64
 #define STATFS         statvfs64
@@ -261,7 +253,7 @@ static struct
    preceding entries in /proc/mounts; that makes df hang if even one
    of the corresponding file systems is hard-mounted but not available.  */
 
-#if USE_STATVFS && !(!defined STAT_STATVFS && defined STAT_STATVFS64)
+#if defined(USE_STATVFS) && !(!defined STAT_STATVFS && defined STAT_STATVFS64)
 static int
 statvfs_works (void)
 {
@@ -285,16 +277,16 @@ filegui__check_attrs_on_fs (const char *fs_path)
 {
     STRUCT_STATVFS stfs;
 
-#if USE_STATVFS && defined(STAT_STATVFS)
+#if defined(USE_STATVFS) && defined(STAT_STATVFS)
     if (statvfs_works () && statvfs (fs_path, &stfs) != 0)
         return TRUE;
 #else
     if (STATFS (fs_path, &stfs) != 0)
         return TRUE;
 #endif
 
-#if (USE_STATVFS && defined(HAVE_STRUCT_STATVFS_F_TYPE))                                           \
-    || (!USE_STATVFS && defined(HAVE_STRUCT_STATFS_F_TYPE))
+#if (defined(USE_STATVFS) && defined(HAVE_STRUCT_STATVFS_F_TYPE))                                  \
+    || (!defined(USE_STATVFS) && defined(HAVE_STRUCT_STATFS_F_TYPE))
     switch ((filegui_nonattrs_fs_t) stfs.f_type)
     {
     case MSDOS_SUPER_MAGIC: