From 3df837b224e105ff45c31ed567f84a0af4116980 Mon Sep 17 00:00:00 2001 From: Andrea Mazzoleni Date: Sat, 24 Jan 2015 14:34:53 +0100 Subject: [PATCH] Clean the configure script --- cmdline/portable.h | 6 ++++++ configure.ac | 6 ++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/cmdline/portable.h b/cmdline/portable.h index 76a1df43..26eef4e7 100644 --- a/cmdline/portable.h +++ b/cmdline/portable.h @@ -156,6 +156,12 @@ #if HAVE_SYS_WAIT_H #include #endif +#ifndef WEXITSTATUS +#define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8) +#endif +#ifndef WIFEXITED +#define WIFEXITED(stat_val) (((stat_val) & 255) == 0) +#endif #if HAVE_GETOPT_H #include diff --git a/configure.ac b/configure.ac index 521b2fc9..9c63fa3c 100644 --- a/configure.ac +++ b/configure.ac @@ -15,19 +15,18 @@ AC_CHECK_PROG([SDE],[sde],[sde],[]) AC_CHECK_PROG([ADVD2],[advd2],[advd2],[]) AM_CONDITIONAL(HAVE_ADVD2, [test x"$ADVD2" != x]) -dnl Checks for libraries. +dnl Checks for system. AC_SYS_LARGEFILE dnl Checks for header files. AC_HEADER_ASSERT -AC_HEADER_STDC AC_HEADER_DIRENT AC_HEADER_TIME AC_HEADER_SYS_WAIT AC_CHECK_HEADERS([fcntl.h stddef.h stdint.h stdlib.h string.h limits.h]) AC_CHECK_HEADERS([unistd.h getopt.h fnmatch.h io.h inttypes.h byteswap.h]) AC_CHECK_HEADERS([pthread.h math.h]) -AC_CHECK_HEADERS([sys/time.h sys/wait.h sys/file.h sys/ioctl.h sys/vfs.h sys/statfs.h sys/param.h sys/mount.h]) +AC_CHECK_HEADERS([sys/file.h sys/ioctl.h sys/vfs.h sys/statfs.h sys/param.h sys/mount.h]) AC_CHECK_HEADERS([linux/fiemap.h linux/fs.h mach/mach_time.h]) dnl Checks for typedefs, structures, and compiler characteristics. @@ -72,7 +71,6 @@ AC_CHECK_MEMBERS([struct statfs.f_type], [], [], [[ ]]) dnl Checks for library functions. -AC_SYS_LARGEFILE AC_CHECK_FUNCS([memset strchr strerror strrchr mkdir gettimeofday strtoul]) AC_CHECK_FUNCS([getopt getopt_long snprintf vsnprintf]) AC_CHECK_FUNCS([ftruncate fallocate fsync access posix_fallocate posix_fadvise])