X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=ucw%2Fperl%2FUCW%2FConfigure%2FC.pm;h=e3a7fdf859440f8b9d0187e3df3675b282f6241b;hb=82915e16f119cfd64c361ba7079299186611bf89;hp=b5e8c0c0d2ff66cbe10df6a4a91c51f1824eb76f;hpb=d5fdccbecd2acde9a6e067b54fcd69b02f31a820;p=libucw.git

diff --git a/ucw/perl/UCW/Configure/C.pm b/ucw/perl/UCW/Configure/C.pm
index b5e8c0c0..e3a7fdf8 100644
--- a/ucw/perl/UCW/Configure/C.pm
+++ b/ucw/perl/UCW/Configure/C.pm
@@ -256,10 +256,14 @@ 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 regexp library on Darwin isn't compatible, using POSIX regexp.\n";
+		Warn "BSD regex library on Darwin isn't compatible, using POSIX regex.\n";
 	}
 }