From: Andreas Schneider Date: Wed, 2 Feb 2011 09:40:06 +0000 (+0100) Subject: replace: Try to fix broken sys/capabilites.h on Linux. X-Git-Tag: tevent-0.9.11~1089 X-Git-Url: http://git.samba.org/samba.git/?p=bbaumbach%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=c2207e9b2cdec9cd4c32184c668a2c469edb7148 replace: Try to fix broken sys/capabilites.h on Linux. As this is more or less a broken header we need to include linux/types.h before sys/capabilities.h to avoid redefinitions. Autobuild-User: Andreas Schneider Autobuild-Date: Wed Feb 2 11:57:04 CET 2011 on sn-devel-104 --- diff --git a/lib/replace/system/capability.h b/lib/replace/system/capability.h index a7b78f02756..832bc29152a 100644 --- a/lib/replace/system/capability.h +++ b/lib/replace/system/capability.h @@ -37,6 +37,10 @@ #define BROKEN_RHEL5_SYS_CAP_HEADER_WORKAROUND #endif +#ifdef HAVE_LINUX_TYPES_H +#include +#endif + #include #ifdef BROKEN_RHEL5_SYS_CAP_HEADER_WORKAROUND diff --git a/lib/replace/system/config.m4 b/lib/replace/system/config.m4 index 04364bc3a1d..71d3d53c3d2 100644 --- a/lib/replace/system/config.m4 +++ b/lib/replace/system/config.m4 @@ -25,6 +25,7 @@ fi AC_HEADER_SYS_WAIT # capability +AC_CHECK_HEADERS(linux/types.h) AC_CHECK_HEADERS(sys/capability.h) case "$host_os" in diff --git a/lib/replace/wscript b/lib/replace/wscript index c6c4fe1fdf8..450e474f1ae 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript @@ -40,7 +40,7 @@ def configure(conf): conf.CHECK_HEADERS('crypt.h locale.h acl/libacl.h compat.h') conf.CHECK_HEADERS('acl/libacl.h attr/xattr.h compat.h ctype.h dustat.h') conf.CHECK_HEADERS('fcntl.h fnmatch.h glob.h history.h krb5.h langinfo.h') - conf.CHECK_HEADERS('libaio.h locale.h ndir.h pwd.h') + conf.CHECK_HEADERS('libaio.h linux/types.h locale.h ndir.h pwd.h') conf.CHECK_HEADERS('shadow.h sys/acl.h') conf.CHECK_HEADERS('sys/attributes.h sys/capability.h sys/dir.h sys/epoll.h') conf.CHECK_HEADERS('sys/fcntl.h sys/filio.h sys/filsys.h sys/fs/s5param.h sys/fs/vx/quota.h')