]> granicus.if.org Git - strace/commitdiff
configure: cleanup struct statfs/statfs64 member checks
authorDmitry V. Levin <ldv@altlinux.org>
Thu, 17 Aug 2017 12:43:18 +0000 (12:43 +0000)
committerDmitry V. Levin <ldv@altlinux.org>
Thu, 17 Aug 2017 12:43:18 +0000 (12:43 +0000)
* configure.ac <AC_CHECK_TYPES([struct statfs])>: Merge several
AC_CHECK_MEMBERS checks of struct statfs members into a single check.
<AC_CHECK_TYPES([struct statfs64])>: Likewise, for checks
of struct statfs64 members.

configure.ac

index cb398fb5372a88ebe84f28199343d84bf59504da..b4abdf8b8bdf11542c0203d7165d3613998fc879 100644 (file)
@@ -448,25 +448,23 @@ AC_CHECK_TYPES([struct ifaddrlblmsg],,, [#include <linux/if_addrlabel.h>])
 AC_CHECK_TYPES([struct netconfmsg],,, [#include <linux/netconf.h>])
 
 AC_CHECK_TYPES([struct statfs], [
-       AC_CHECK_MEMBERS([struct statfs.f_frsize],,, [#include <linux/types.h>
-#include <asm/statfs.h>])
-       AC_CHECK_MEMBERS([struct statfs.f_flags],,, [#include <linux/types.h>
-#include <asm/statfs.h>])
-       AC_CHECK_MEMBERS([struct statfs.f_fsid.val],,, [#include <linux/types.h>
-#include <asm/statfs.h>])
-       AC_CHECK_MEMBERS([struct statfs.f_fsid.__val],,, [#include <linux/types.h>
+       AC_CHECK_MEMBERS(m4_normalize([
+               struct statfs.f_frsize,
+               struct statfs.f_flags,
+               struct statfs.f_fsid.val,
+               struct statfs.f_fsid.__val
+       ]),,, [#include <linux/types.h>
 #include <asm/statfs.h>])
 ],, [#include <linux/types.h>
 #include <asm/statfs.h>])
 
 AC_CHECK_TYPES([struct statfs64], [
-       AC_CHECK_MEMBERS([struct statfs64.f_frsize],,, [#include <linux/types.h>
-#include <asm/statfs.h>])
-       AC_CHECK_MEMBERS([struct statfs64.f_flags],,, [#include <linux/types.h>
-#include <asm/statfs.h>])
-       AC_CHECK_MEMBERS([struct statfs64.f_fsid.val],,, [#include <linux/types.h>
-#include <asm/statfs.h>])
-       AC_CHECK_MEMBERS([struct statfs64.f_fsid.__val],,, [#include <linux/types.h>
+       AC_CHECK_MEMBERS(m4_normalize([
+               struct statfs64.f_frsize,
+               struct statfs64.f_flags,
+               struct statfs64.f_fsid.val,
+               struct statfs64.f_fsid.__val
+       ]),,, [#include <linux/types.h>
 #include <asm/statfs.h>])
 ],, [#include <linux/types.h>
 #include <asm/statfs.h>])