From d0418fb869e5a95022888b44fe67a31f08986d61 Mon Sep 17 00:00:00 2001
From: Ben Summers <ben@fluffy.co.uk>
Date: Mon, 30 Jan 2006 20:04:53 +0000
Subject: Merge chris/bb-save-state, resolving conflicts

---
 configure.ac | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 2ed3812a..8a4175ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,9 +74,10 @@ Upgrade or read the documentation for alternatives]])
 AC_HEADER_DIRENT
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS([execinfo.h netinet/in.h regex.h sys/types.h sys/xattr.h])
-AC_CHECK_HEADERS([sys/endian.h asm/byteorder.h syslog.h signal.h sys/time.h])
-AC_CHECK_HEADERS([time.h])
+AC_CHECK_HEADERS([execinfo.h regex.h signal.h syslog.h time.h])
+AC_CHECK_HEADERS([asm/byteorder.h])
+AC_CHECK_HEADERS([netinet/in.h])
+AC_CHECK_HEADERS([sys/endian.h sys/param.h sys/types.h sys/wait.h sys/xattr.h sys/time.h])
 
 
 ### Checks for typedefs, structures, and compiler characteristics.
-- 
cgit v1.2.3