diff options
| author | Stefan Metzmacher <metze@samba.org> | 2011-02-03 03:32:21 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2011-02-03 04:32:43 +0100 |
| commit | 5f18925e695d0c271aea456a4ee63aeb1e8bbf96 (patch) | |
| tree | 79377a7257fa10c9570aede3c64b0491b69e42a3 | |
| parent | c1c3cb0a237b1ba075e67979f9aad329d6e5914f (diff) | |
| download | samba-5f18925e695d0c271aea456a4ee63aeb1e8bbf96.tar.gz samba-5f18925e695d0c271aea456a4ee63aeb1e8bbf96.tar.bz2 samba-5f18925e695d0c271aea456a4ee63aeb1e8bbf96.zip | |
Revert "replace: Try to fix broken sys/capabilites.h on Linux."
This reverts commit c2207e9b2cdec9cd4c32184c668a2c469edb7148.
This still doesn't build for me on ClearOS 5.2.
metze
| -rw-r--r-- | lib/replace/system/capability.h | 4 | ||||
| -rw-r--r-- | lib/replace/system/config.m4 | 1 | ||||
| -rw-r--r-- | lib/replace/wscript | 2 |
3 files changed, 1 insertions, 6 deletions
diff --git a/lib/replace/system/capability.h b/lib/replace/system/capability.h index 832bc29152..a7b78f0275 100644 --- a/lib/replace/system/capability.h +++ b/lib/replace/system/capability.h @@ -37,10 +37,6 @@ #define BROKEN_RHEL5_SYS_CAP_HEADER_WORKAROUND #endif -#ifdef HAVE_LINUX_TYPES_H -#include <linux/types.h> -#endif - #include <sys/capability.h> #ifdef BROKEN_RHEL5_SYS_CAP_HEADER_WORKAROUND diff --git a/lib/replace/system/config.m4 b/lib/replace/system/config.m4 index 71d3d53c3d..04364bc3a1 100644 --- a/lib/replace/system/config.m4 +++ b/lib/replace/system/config.m4 @@ -25,7 +25,6 @@ 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 450e474f1a..c6c4fe1fdf 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 linux/types.h locale.h ndir.h pwd.h') + conf.CHECK_HEADERS('libaio.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') |