[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  ede90a5 build: Show extra configure results found by WAF as well
       via  9805742 ccan: fix autoconf test for isblank()
       via  75c03b3 libreplace: Add missing tests for HAVE_MREMAP and HAVE_SHARED_MMAP
      from  80913ae libreplace: Fix autoconf build on platforms needing xattrs

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


- Log -----------------------------------------------------------------
commit ede90a55c5ab71ea043de379d46b6803e3b7a432
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Sat Jun 2 14:31:41 2012 +1000

    build: Show extra configure results found by WAF as well
    
    This may assist in debugging a difference in a configure test on the
    build farm.
    
    Andrew Bartlett
    
    Autobuild-User: Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date: Sat Jun  2 09:46:09 CEST 2012 on sn-devel-104

commit 980574238f2db1b40aa5dc8236cef93d98cde0e3
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Sat Jun 2 14:15:42 2012 +1000

    ccan: fix autoconf test for isblank()
    
    The define in the C code is HAVE_ISBLANK
    
    Andrew Bartlett

commit 75c03b332ce42d396f95b1ea49a58c25f989c021
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Sat Jun 2 14:13:14 2012 +1000

    libreplace: Add missing tests for HAVE_MREMAP and HAVE_SHARED_MMAP

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

Summary of changes:
 lib/ccan/libccan.m4          |   12 ++++++------
 lib/replace/wscript          |   10 ++++++++++
 source3/Makefile-smbtorture4 |    4 +++-
 3 files changed, 19 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/ccan/libccan.m4 b/lib/ccan/libccan.m4
index 1efa0f0..93dc99e 100644
--- a/lib/ccan/libccan.m4
+++ b/lib/ccan/libccan.m4
@@ -268,19 +268,19 @@ if test x"$samba_cv_compound_literals" = xyes ; then
 	     [whether we have compound literals])
 fi
 
-AC_CACHE_CHECK([whether we have __builtin_have_isblank],
-	       samba_cv_builtin_have_isblank,
+AC_CACHE_CHECK([whether we have isblank],
+	       samba_cv_have_isblank,
 	       [
 	         AC_LINK_IFELSE(
 			[#include <ctype.h>
 			 int main(void) { return isblank(' ') ? 0 : 1; }
 			],
-			samba_cv_builtin_have_isblank=yes)
+			samba_cv_have_isblank=yes)
 		])
 
-if test x"$samba_cv_builtin_have_isblank" = xyes ; then
-   AC_DEFINE(HAVE_BUILTIN_HAVE_ISBLANK, 1,
-	     [whether we have __builtin_have_isblank])
+if test x"$samba_cv_have_isblank" = xyes ; then
+   AC_DEFINE(HAVE_ISBLANK, 1,
+	     [whether we have isblank])
 fi
 
 # FIXME: We could use endian.h or sys/endian.h here, and __BYTE_ORDER for
diff --git a/lib/replace/wscript b/lib/replace/wscript
index 6331b88..b998677 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -345,6 +345,16 @@ removeea setea
                     addmain=False,
                     msg="Checking for C99 vsnprintf")
 
+    conf.CHECK_CODE('#include "test/shared_mmap.c"',
+                    addmain=False, add_headers=False, execute=True,
+                    define='HAVE_SHARED_MMAP',
+                    msg="Checking for HAVE_SHARED_MMAP")
+
+    conf.CHECK_CODE('#include "test/shared_mremap.c"',
+                    addmain=False, add_headers=False, execute=True,
+                    define='HAVE_MREMAP',
+                    msg="Checking for HAVE_MREMAP")
+
     # OpenBSD (and I've heard HPUX) doesn't sync between mmap and write.
     # FIXME: Anything other than a 0 or 1 exit code should abort configure!
     conf.CHECK_CODE('#include "test/incoherent_mmap.c"',
diff --git a/source3/Makefile-smbtorture4 b/source3/Makefile-smbtorture4
index bd1764b..1b0c921 100644
--- a/source3/Makefile-smbtorture4
+++ b/source3/Makefile-smbtorture4
@@ -24,5 +24,7 @@ bin/ndrdump4: $(BINARY_PREREQS) samba4-configure
 
 samba4-config-compare: samba4-configure
 	@echo "Comparing config.h from autoconf and waf"
-	@echo "Configure checks missing from WAF are:"
+	@echo "Configure results missing from WAF are:"
 	../buildtools/compare_config_h3.sh include/autoconf/config.h ../bin/default/include/config.h
+	@echo "Configure results additionaly found by WAF are:"
+	DIFF="comm -13" ../buildtools/compare_config_h3.sh include/autoconf/config.h ../bin/default/include/config.h


-- 
Samba Shared Repository