Merge branch 'master' into dev-lib

Conflicts:
	build/Maketop
	ucw/perl/UCW/Configure/C.pm

diff --cc build/Makebottom
Simple merge

diff --cc build/Maketop
Simple merge

diff --cc ucw/perl/UCW/Configure/C.pm
index 3e65c1f258228ac8c3388e9f1938470dcf358dc6,9e8da479c70b6ab53093d7d9082327bea54231e8..e3a7fdf859440f8b9d0187e3df3675b282f6241b
--- 1/ucw/perl/UCW/Configure/C.pm
--- 2/ucw/perl/UCW/Configure/C.pm
+++ b/ucw/perl/UCW/Configure/C.pm
@@@ -256,11 -256,11 +256,15 @@@ if (IsSet("CONFIG_DARWIN")) 
        Append("COPT" => "-I/sw/include");
        # Fill in some constants not found in the system header files
        Set("SOL_TCP" => 6);            # missing in /usr/include/netinet/tcp.h
 -      Set("O_DIRECT" => 0);           # Darwin doesn't support direct IO, so make Sherlock at least compilable
 +      if (IsGiven("CONFIG_DIRECT_IO") && IsSet("CONFIG_DIRECT_IO")) {
 +              Fail("Direct I/O is not available on darwin");
 +      } else {
 +              UnSet("CONFIG_DIRECT_IO");
 +      }
+       if (!IsSet("CONFIG_POSIX_REGEX") && !IsSet("CONFIG_PCRE")) {
+               Set("CONFIG_POSIX_REGEX" => 1);
+               Warn "BSD regex library on Darwin isn't compatible, using POSIX regex.\n";
+       }
  }
  
  ### Writing C headers with configuration ###