From: Robert Spalek <rspalek@gmail.com>
Date: Wed, 4 Feb 2009 17:22:34 +0000 (-0800)
Subject: Merge branch 'master' into dev-lib
X-Git-Tag: holmes-import~118
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=804b539f2f9d9af87ffa7036fd2b181fb12d86f1;p=libucw.git

Merge branch 'master' into dev-lib

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

804b539f2f9d9af87ffa7036fd2b181fb12d86f1
diff --cc ucw/perl/UCW/Configure/C.pm
index 3e65c1f2,9e8da479..e3a7fdf8
--- a/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 ###