svn commit: samba r18337 - in branches/SAMBA_4_0/source: build/m4 build/tests lib/replace

Author: tridge
Date: 2006-09-10 12:45:37 +0000 (Sun, 10 Sep 2006)
New Revision: 18337

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18337

Log:

more -Ae tests in check_cc.m4

honor the MMAP_BLACKLIST

Modified:
   branches/SAMBA_4_0/source/build/m4/check_cc.m4
   branches/SAMBA_4_0/source/build/tests/shared_mmap.c
   branches/SAMBA_4_0/source/lib/replace/replace.h


Changeset:
Modified: branches/SAMBA_4_0/source/build/m4/check_cc.m4
===================================================================
--- branches/SAMBA_4_0/source/build/m4/check_cc.m4      2006-09-10 12:38:32 UTC 
(rev 18336)
+++ branches/SAMBA_4_0/source/build/m4/check_cc.m4      2006-09-10 12:45:37 UTC 
(rev 18337)
@@ -168,12 +168,8 @@
 case "$host_os" in
        # Try to work out if this is the native HPUX compiler that uses the -Ae 
flag.
        *hpux*)
-               AC_PROG_CC_FLAG(Ae)
                # mmap on HPUX is completely broken...
                AC_DEFINE(MMAP_BLACKLIST, 1, [Whether MMAP is broken])
-               if test $ac_cv_prog_cc_Ae = yes; then
-                       CPPFLAGS="$CPPFLAGS -Ae"
-               fi
                ;;
 
        *aix*)

Modified: branches/SAMBA_4_0/source/build/tests/shared_mmap.c
===================================================================
--- branches/SAMBA_4_0/source/build/tests/shared_mmap.c 2006-09-10 12:38:32 UTC 
(rev 18336)
+++ branches/SAMBA_4_0/source/build/tests/shared_mmap.c 2006-09-10 12:45:37 UTC 
(rev 18337)
@@ -39,6 +39,8 @@
                                   MAP_FILE | MAP_SHARED, 
                                   fd, 0);
 
+               if (buf == (int *)-1) exit(1);
+
                while (count-- && buf[9124] != 55732) sleep(1);
 
                if (count <= 0) exit(1);

Modified: branches/SAMBA_4_0/source/lib/replace/replace.h
===================================================================
--- branches/SAMBA_4_0/source/lib/replace/replace.h     2006-09-10 12:38:32 UTC 
(rev 18336)
+++ branches/SAMBA_4_0/source/lib/replace/replace.h     2006-09-10 12:45:37 UTC 
(rev 18337)
@@ -352,4 +352,8 @@
 #define __STRING(x)    #x
 #endif
 
+#if MMAP_BLACKLIST
+#undef HAVE_MMAP
 #endif
+
+#endif