libreplace: include sys/file.h only when available

thanks to Joachim Schmitz <schmitz@hp.com>. This fixes #7460.

diff --git a/lib/replace/system/config.m4 b/lib/replace/system/config.m4
index 39c2f58283b07e0c96080525aa5caa24f3506665..b8568a5165079cd10361a1971061eda0ffa747a3 100644 (file)
--- a/lib/replace/system/config.m4
+++ b/lib/replace/system/config.m4
@@ -1,7 +1,7 @@
 # filesys
 AC_HEADER_DIRENT 
 AC_CHECK_HEADERS(fcntl.h sys/fcntl.h sys/resource.h sys/ioctl.h sys/mode.h sys/filio.h sys/fs/s5param.h sys/filsys.h)
-AC_CHECK_HEADERS(sys/acl.h acl/libacl.h)
+AC_CHECK_HEADERS(sys/acl.h acl/libacl.h sys/file.h)
 
 # select
 AC_CHECK_HEADERS(sys/select.h)

diff --git a/lib/replace/system/filesys.h b/lib/replace/system/filesys.h
index 22e3d23f3e79a8ed2ee32728d99c1bfd6109073c..6cf2dd287ada1d4b79b7b54c83e363a05414899b 100644 (file)
--- a/lib/replace/system/filesys.h
+++ b/lib/replace/system/filesys.h
@@ -77,7 +77,9 @@
 #include <sys/filio.h>
 #endif
 
+#ifdef HAVE_SYS_FILE_H
 #include <sys/file.h>
+#endif
 
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>

diff --git a/lib/replace/wscript b/lib/replace/wscript
index 4bafcadbd40f3300083cf7062880ce9c987d0a5d..57739124e93843af4ec93024ab06402a9f00001b 100644 (file)
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -42,7 +42,7 @@ def configure(conf):
     conf.CHECK_HEADERS('sys/fcntl.h sys/filio.h sys/filsys.h sys/fs/s5param.h sys/fs/vx/quota.h')
     conf.CHECK_HEADERS('sys/id.h sys/ioctl.h sys/ipc.h sys/mman.h sys/mode.h sys/ndir.h sys/priv.h')
     conf.CHECK_HEADERS('sys/resource.h sys/security.h sys/shm.h sys/statfs.h sys/statvfs.h sys/termio.h')
-    conf.CHECK_HEADERS('sys/vfs.h sys/xattr.h termio.h termios.h')
+    conf.CHECK_HEADERS('sys/vfs.h sys/xattr.h termio.h termios.h sys/file.h')
     conf.CHECK_HEADERS('sys/wait.h sys/stat.h malloc.h grp.h')
     conf.CHECK_HEADERS('sys/select.h setjmp.h utime.h sys/syslog.h syslog.h')
     conf.CHECK_HEADERS('stdarg.h vararg.h sys/mount.h mntent.h')