summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Jacke <bj@sernet.de>2010-05-30 21:44:14 +0200
committerBjörn Jacke <bj@sernet.de>2010-05-30 21:46:35 +0200
commit6a78241f4a9aae84e91ea2e49f066f2e5203beba (patch)
treeb7d51bb4ba64f4fc16cc2ef8156bcf0da13257c4
parent3030d9db4ea7ddecc2e8bbef225738e0336e9be4 (diff)
downloadsamba-6a78241f4a9aae84e91ea2e49f066f2e5203beba.tar.gz
samba-6a78241f4a9aae84e91ea2e49f066f2e5203beba.tar.bz2
samba-6a78241f4a9aae84e91ea2e49f066f2e5203beba.zip
libreplace: include sys/file.h only when available
thanks to Joachim Schmitz <schmitz@hp.com>. This fixes #7460.
-rw-r--r--lib/replace/system/config.m42
-rw-r--r--lib/replace/system/filesys.h2
-rw-r--r--lib/replace/wscript2
3 files changed, 4 insertions, 2 deletions
diff --git a/lib/replace/system/config.m4 b/lib/replace/system/config.m4
index 39c2f58283..b8568a5165 100644
--- 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 22e3d23f3e..6cf2dd287a 100644
--- 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 4bafcadbd4..57739124e9 100644
--- 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')