Merge r455 from trunk: Fix Solaris 10/OpenSolaris build

Submitted by:	Fabian Groffen

SVN-Revision: 456

diff --git a/configure.ac b/configure.ac
index cddeb48bfe0a26b41c0b2d1a65e0ac4bd4f26fe0..7f474650432b1cb72510edde79e91163d7aa5290 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -165,7 +165,8 @@ AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS([errno.h ext2fs/ext2_fs.h fcntl.h  grp.h])
 AC_CHECK_HEADERS([inttypes.h langinfo.h limits.h linux/fs.h])
 AC_CHECK_HEADERS([locale.h paths.h poll.h pwd.h regex.h stdarg.h])
-AC_CHECK_HEADERS([stdint.h stdlib.h string.h sys/acl.h sys/ioctl.h])
+AC_CHECK_HEADERS([stdint.h stdlib.h string.h])
+AC_CHECK_HEADERS([sys/acl.h sys/ioctl.h sys/mkdev.h])
 AC_CHECK_HEADERS([sys/param.h sys/poll.h sys/select.h sys/time.h sys/utime.h])
 AC_CHECK_HEADERS([time.h unistd.h utime.h wchar.h wctype.h])
 

diff --git a/cpio/cpio.c b/cpio/cpio.c
index 50bc997db6dd9a44a3a0578958db0e717d301536..f031d975e1815801611a6f802917b2ed80ff3cd5 100644 (file)
--- a/cpio/cpio.c
+++ b/cpio/cpio.c
@@ -32,6 +32,9 @@ __FBSDID("$FreeBSD: src/usr.bin/cpio/cpio.c,v 1.15 2008/12/06 07:30:40 kientzle
 #include <archive.h>
 #include <archive_entry.h>
 
+#ifdef HAVE_SYS_MKDEV_H
+#include <sys/mkdev.h>
+#endif
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif