From 677fc9169c2802f74ec15e16041baba01fec8335 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 6 Mar 2012 20:13:54 -0500 Subject: [PATCH] configure: sort the lists for AC_CHECK_FUNCS and AC_CHECK_HEADERS By using m4_flatten, should be easier to maintain these lists. Regen configure and config.h.in after doing this. (Modified by tytso to use m4_flatten for the list of header files checked by AC_CHECK_HEADERS) Signed-off-by: Mike Frysinger Signed-off-by: "Theodore Ts'o" --- configure | 4 +-- configure.in | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-- lib/config.h.in | 6 ++-- 3 files changed, 91 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 4b1939c..8cb332c 100755 --- a/configure +++ b/configure @@ -10251,7 +10251,7 @@ fi done fi -for ac_header in dirent.h errno.h execinfo.h getopt.h malloc.h mntent.h paths.h semaphore.h setjmp.h signal.h stdarg.h stdint.h stdlib.h termios.h termio.h unistd.h utime.h linux/falloc.h linux/fd.h linux/major.h net/if_dl.h netinet/in.h sys/disklabel.h sys/file.h sys/ioctl.h sys/mkdev.h sys/mman.h sys/prctl.h sys/queue.h sys/resource.h sys/select.h sys/socket.h sys/sockio.h sys/stat.h sys/syscall.h sys/sysmacros.h sys/time.h sys/types.h sys/un.h sys/wait.h +for ac_header in dirent.h errno.h execinfo.h getopt.h malloc.h mntent.h paths.h semaphore.h setjmp.h signal.h stdarg.h stdint.h stdlib.h termios.h termio.h unistd.h utime.h linux/falloc.h linux/fd.h linux/major.h net/if_dl.h netinet/in.h sys/disklabel.h sys/file.h sys/ioctl.h sys/mkdev.h sys/mman.h sys/prctl.h sys/queue.h sys/resource.h sys/select.h sys/socket.h sys/sockio.h sys/stat.h sys/syscall.h sys/sysmacros.h sys/time.h sys/types.h sys/un.h sys/wait.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" @@ -10893,7 +10893,7 @@ if test "$ac_res" != no; then : fi fi -for ac_func in chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync quotactl strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap msync utime setresuid setresgid usleep nanosleep getdtablesize getrlimit sync_file_range posix_fadvise fallocate fallocate64 blkid_probe_get_topology mbstowcs backtrace +for ac_func in __secure_getenv backtrace blkid_probe_get_topology chflags fallocate fallocate64 fchown fdatasync fstat64 ftruncate64 getdtablesize getmntinfo getrlimit getrusage jrand48 llseek lseek64 mallinfo mbstowcs memalign mmap msync nanosleep open64 pathconf posix_fadvise posix_memalign prctl quotactl setresgid setresuid srandom strcasecmp strdup strnlen strptime strtoull sync_file_range sysconf usleep utime valloc do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" diff --git a/configure.in b/configure.in index 9fb29cb..32d5768 100644 --- a/configure.in +++ b/configure.in @@ -784,7 +784,48 @@ if test $cross_compiling = no; then else AC_CHECK_PROGS(BUILD_CC, gcc cc) fi -AC_CHECK_HEADERS(dirent.h errno.h execinfo.h getopt.h malloc.h mntent.h paths.h semaphore.h setjmp.h signal.h stdarg.h stdint.h stdlib.h termios.h termio.h unistd.h utime.h linux/falloc.h linux/fd.h linux/major.h net/if_dl.h netinet/in.h sys/disklabel.h sys/file.h sys/ioctl.h sys/mkdev.h sys/mman.h sys/prctl.h sys/queue.h sys/resource.h sys/select.h sys/socket.h sys/sockio.h sys/stat.h sys/syscall.h sys/sysmacros.h sys/time.h sys/types.h sys/un.h sys/wait.h) +AC_CHECK_HEADERS(m4_flatten([ + dirent.h + errno.h + execinfo.h + getopt.h + malloc.h + mntent.h + paths.h + semaphore.h + setjmp.h + signal.h + stdarg.h + stdint.h + stdlib.h + termios.h + termio.h + unistd.h + utime.h + linux/falloc.h + linux/fd.h + linux/major.h + net/if_dl.h + netinet/in.h + sys/disklabel.h + sys/file.h + sys/ioctl.h + sys/mkdev.h + sys/mman.h + sys/prctl.h + sys/queue.h + sys/resource.h + sys/select.h + sys/socket.h + sys/sockio.h + sys/stat.h + sys/syscall.h + sys/sysmacros.h + sys/time.h + sys/types.h + sys/un.h + sys/wait.h +])) AC_CHECK_HEADERS(sys/disk.h sys/mount.h,,, [[ #if HAVE_SYS_QUEUE_H @@ -914,7 +955,50 @@ if test -n "$BLKID_CMT"; then AC_SEARCH_LIBS([blkid_probe_all], [blkid]) fi dnl -AC_CHECK_FUNCS(chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync quotactl strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap msync utime setresuid setresgid usleep nanosleep getdtablesize getrlimit sync_file_range posix_fadvise fallocate fallocate64 blkid_probe_get_topology mbstowcs backtrace) +AC_CHECK_FUNCS(m4_flatten([ + __secure_getenv + backtrace + blkid_probe_get_topology + chflags + fallocate + fallocate64 + fchown + fdatasync + fstat64 + ftruncate64 + getdtablesize + getmntinfo + getrlimit + getrusage + jrand48 + llseek + lseek64 + mallinfo + mbstowcs + memalign + mmap + msync + nanosleep + open64 + pathconf + posix_fadvise + posix_memalign + prctl + quotactl + setresgid + setresuid + srandom + strcasecmp + strdup + strnlen + strptime + strtoull + sync_file_range + sysconf + usleep + utime + valloc +])) dnl dnl Check to see if -lsocket is required (solaris) to make something dnl that uses socket() to compile; this is needed for the UUID library diff --git a/lib/config.h.in b/lib/config.h.in index 0e83634..f69eebe 100644 --- a/lib/config.h.in +++ b/lib/config.h.in @@ -239,6 +239,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_MNTENT_H +/* Define to 1 if you have the `msync' function. */ +#undef HAVE_MSYNC + /* Define to 1 if you have the `munmap' function. */ #undef HAVE_MUNMAP @@ -405,9 +408,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_QUEUE_H -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_QUOTA_H - /* Define to 1 if you have the header file. */ #undef HAVE_SYS_RESOURCE_H -- 1.8.3.1