[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  1e42aa6 replace: Try to fix broken sys/capabilites.h on Linux.
       via  5f18925 Revert "replace: Try to fix broken sys/capabilites.h on Linux."
      from  c1c3cb0 s3:libnet_dssync_passdb: remove useless DEBUG statements

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 1e42aa6b3a2912426caebaf89596fa7c9f19ba2e
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Feb 2 10:40:06 2011 +0100

    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.
    
    Systems like ClearOS 5.2 need linux/types.h very early.
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Thu Feb  3 05:26:12 CET 2011 on sn-devel-104

commit 5f18925e695d0c271aea456a4ee63aeb1e8bbf96
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Feb 3 03:32:21 2011 +0100

    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

-----------------------------------------------------------------------

Summary of changes:
 lib/replace/libreplace.m4       |    2 ++
 lib/replace/replace.h           |    7 +++++++
 lib/replace/system/capability.h |    4 ----
 lib/replace/system/config.m4    |    1 -
 lib/replace/wscript             |    4 ++--
 5 files changed, 11 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/replace/libreplace.m4 b/lib/replace/libreplace.m4
index 3dd64ef..24fc5cd 100644
--- a/lib/replace/libreplace.m4
+++ b/lib/replace/libreplace.m4
@@ -89,6 +89,8 @@ AC_INCLUDES_DEFAULT
 #endif]
 )
 
+AC_CHECK_HEADERS(linux/types.h)
+
 AC_CACHE_CHECK([for working mmap],libreplace_cv_HAVE_MMAP,[
 AC_TRY_RUN([#include "$libreplacedir/test/shared_mmap.c"],
            libreplace_cv_HAVE_MMAP=yes,libreplace_cv_HAVE_MMAP=no,libreplace_cv_HAVE_MMAP=cross)])
diff --git a/lib/replace/replace.h b/lib/replace/replace.h
index f738658..60aa3d4 100644
--- a/lib/replace/replace.h
+++ b/lib/replace/replace.h
@@ -121,6 +121,13 @@
 #include <stddef.h>
 #endif
 
+#ifdef HAVE_LINUX_TYPES_H
+/*
+ * This is needed as some broken header files require this to be included early
+ */
+#include <linux/types.h>
+#endif
+
 #ifndef HAVE_STRERROR
 extern char *sys_errlist[];
 #define strerror(i) sys_errlist[i]
diff --git a/lib/replace/system/capability.h b/lib/replace/system/capability.h
index 832bc29..a7b78f0 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 71d3d53..04364bc 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 450e474..9fbd3b5 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -37,10 +37,10 @@ def configure(conf):
         conf.DEFINE('_OSF_SOURCE', 1, add_to_cflags=True)
         conf.DEFINE('_XOPEN_SOURCE', 600, add_to_cflags=True)
 
-    conf.CHECK_HEADERS('crypt.h locale.h acl/libacl.h compat.h')
+    conf.CHECK_HEADERS('linux/types.h 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')


-- 
Samba Shared Repository