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

diff --git a/ucw/perl/UCW/Configure/C.pm b/ucw/perl/UCW/Configure/C.pm
index a5b37fc7..e3a7fdf8 100644
--- a/ucw/perl/UCW/Configure/C.pm
+++ b/ucw/perl/UCW/Configure/C.pm
@@ -130,7 +130,8 @@ Test("CPU_ARCH", "Checking for CPU architecture", sub {
 					elsif ($model >= 3) { $arch = "prescott"; }
 					else { $arch = "pentium4"; }
 				} elsif ($family == 6 && $gccver >= 3003) {
-					if ($model == 15) { $arch = "prescott"; }
+					if ($model == 23) { $arch = "nocona"; }
+					elsif ($model == 15) { $arch = "prescott"; }
 					elsif (($model == 9 || $model == 13) && $gccver >= 3004) { $arch = "pentium-m"; }
 					elsif ($model >= 7) { $arch = "pentium3"; }
 					elsif ($model >= 3) { $arch = "pentium2"; }
@@ -255,6 +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
+	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 ###