From 1ef7aa65ab5eeae9704487205c7ee2199fec5200 Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Tue, 12 Jan 2016 21:27:36 +0000 Subject: [PATCH] configure.ac: reorder some statements for better readability * configure.ac: Sort and group together AC_PROG_*, AC_C_*, AC_TYPE_*, AC_HEADER_*, AC_CHECK_FUNCS, AC_CHECK_TYPES, AC_CHECK_MEMBERS, and AC_CHECK_HEADERS. --- configure.ac | 153 +++++++++++++++++++++++++++++---------------------- 1 file changed, 87 insertions(+), 66 deletions(-) diff --git a/configure.ac b/configure.ac index 21b83372..f93326d4 100644 --- a/configure.ac +++ b/configure.ac @@ -41,10 +41,13 @@ AM_MAINTAINER_MODE AC_CANONICAL_HOST AC_PROG_CC +AC_PROG_CPP AX_PROG_CC_FOR_BUILD -AC_USE_SYSTEM_EXTENSIONS +AC_PROG_INSTALL AC_PROG_RANLIB +AC_USE_SYSTEM_EXTENSIONS + AC_MSG_CHECKING([for supported architecture]) arch_m32= arch_mx32= @@ -247,37 +250,20 @@ AC_ARG_ENABLE([gcc-Werror], ) AC_SUBST([WARN_CFLAGS]) -AC_PROG_CPP -AC_PROG_INSTALL -AC_C_CONST AC_C_BIGENDIAN +AC_C_CONST AC_C_TYPEOF -AC_HEADER_STDC -AC_HEADER_STDBOOL -AC_HEADER_DIRENT -AC_HEADER_STAT -AC_CHECK_MEMBERS(m4_normalize([ - struct stat.st_atim.tv_nsec, - struct stat.st_blksize, - struct stat.st_blocks, - struct stat.st_ctim.tv_nsec, - struct stat.st_flags, - struct stat.st_fstype, - struct stat.st_gen, - struct stat.st_mtim.tv_nsec, - struct stat.st_rdev -])) +AC_TYPE_GETGROUPS +AC_TYPE_MODE_T AC_TYPE_SIGNAL AC_TYPE_UID_T -AC_TYPE_MODE_T -AC_TYPE_GETGROUPS + +AC_HEADER_DIRENT AC_HEADER_MAJOR -AC_CHECK_TYPES([sig_atomic_t],,, [#include ]) -AC_CHECK_MEMBERS([struct sockaddr_in6.sin6_scope_id],,, -[#include -#include -#include ]) +AC_HEADER_STAT +AC_HEADER_STDBOOL +AC_HEADER_STDC AC_CHECK_FUNCS(m4_normalize([ fanotify_mark @@ -304,6 +290,71 @@ AC_CHECK_FUNCS(m4_normalize([ strsignal utimensat ])) + +AC_CHECK_TYPES([sig_atomic_t, struct sigcontext],,, [#include ]) + +AC_CHECK_TYPES([struct mmsghdr],,, [#include ]) + +AC_CHECK_TYPES([__kernel_long_t, __kernel_ulong_t],,, +[#include ]) + +AC_CHECK_TYPES([struct stat64, struct __old_kernel_stat],,, +[#include +#include ]) + +AC_CHECK_TYPES([struct statfs64],,, [#include ]) + +AC_CHECK_TYPES(m4_normalize([ + struct pt_all_user_regs, + struct ia64_fpreg, + struct ptrace_peeksiginfo_args +]),,, [#include ]) + +AC_CHECK_TYPES(m4_normalize([ + struct flock, + struct flock64, + struct __kernel_flock, + struct __kernel_flock64 +]),,, +[#include +#include ]) + +AC_CHECK_MEMBERS(m4_normalize([ + struct stat.st_atim.tv_nsec, + struct stat.st_blksize, + struct stat.st_blocks, + struct stat.st_ctim.tv_nsec, + struct stat.st_flags, + struct stat.st_fstype, + struct stat.st_gen, + struct stat.st_mtim.tv_nsec, + struct stat.st_rdev +])) + +AC_CHECK_MEMBERS([struct msghdr.msg_control],,, [#include ]) + +AC_CHECK_MEMBERS([struct timex.tai],,, [#include ]) + +AC_CHECK_MEMBERS([struct utsname.domainname],,, [#include ]) + +AC_CHECK_MEMBERS([struct sockaddr_in6.sin6_scope_id],,, +[#include +#include +#include ]) + +AC_CHECK_MEMBERS(m4_normalize([ + struct stat.st_atime_nsec, + struct stat.st_ctime_nsec, + struct stat.st_mtime_nsec +]),,, [#include +#include ]) + +AC_CHECK_MEMBERS(m4_normalize([ + siginfo_t.si_syscall, + siginfo_t.si_timerid, + siginfo_t.si_overrun +]),,, [#include ]) + AC_CHECK_HEADERS(m4_normalize([ asm/cachectl.h asm/sysmips.h @@ -343,56 +394,26 @@ AC_CHECK_HEADERS(m4_normalize([ sys/vfs.h sys/xattr.h ])) + +AC_CHECK_HEADERS([asm/sigcontext.h],,, [#include ]) + +AC_CHECK_HEADERS([netinet/tcp.h netinet/udp.h],,, [#include ]) + AC_CHECK_HEADERS([linux/mqueue.h],,, [#include ]) -AC_CHECK_HEADERS([linux/icmp.h linux/in6.h linux/netlink.h linux/if_packet.h], - [], [], [#include + +AC_CHECK_HEADERS([linux/icmp.h linux/in6.h linux/netlink.h linux/if_packet.h],,, +[#include #include #include ]) -AC_CHECK_HEADERS([asm/sigcontext.h], [], [], [#include ]) -AC_CHECK_TYPES([struct sigcontext],,, [#include ]) -AC_CHECK_HEADERS([netinet/tcp.h netinet/udp.h],,, [#include ]) + AC_CHECK_HEADERS(m4_normalize([ linux/netfilter_arp/arp_tables.h linux/netfilter_bridge/ebtables.h linux/netfilter_ipv4/ip_tables.h linux/netfilter_ipv6/ip6_tables.h -]), [], [], [#include +]),,, [#include #include ]) -AC_CHECK_TYPES([struct mmsghdr],,, [#include ]) -AC_CHECK_MEMBERS([struct msghdr.msg_control],,, [#include ]) - -AC_CHECK_MEMBERS(m4_normalize([ - struct stat.st_atime_nsec, - struct stat.st_ctime_nsec, - struct stat.st_mtime_nsec -]),,, [#include -#include ]) - -AC_CHECK_TYPES([struct stat64],,, [#include -#include ]) -AC_CHECK_TYPES([struct __old_kernel_stat],,, [#include ]) -AC_CHECK_TYPES([struct statfs64],,, [#include ]) - -AC_CHECK_TYPES([struct pt_all_user_regs, struct ia64_fpreg, struct ptrace_peeksiginfo_args],,, - [#include ]) - -AC_CHECK_MEMBERS([struct utsname.domainname],,, [#include ]) - -AC_CHECK_MEMBERS([siginfo_t.si_syscall, - siginfo_t.si_timerid, - siginfo_t.si_overrun],,, [#include ]) - -AC_CHECK_TYPES([struct flock, - struct flock64, - struct __kernel_flock, - struct __kernel_flock64],,, [#include -#include ]) - -AC_CHECK_TYPES([__kernel_long_t, __kernel_ulong_t],,, [#include ]) - -AC_CHECK_MEMBERS([struct timex.tai],,, [#include ]) - AC_CHECK_HEADERS([linux/input.h], [ AC_CHECK_MEMBERS([struct input_absinfo.resolution],,, [#include ]) ]) -- 2.50.1