X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=ucw%2Fperl%2FUCW%2FConfigure%2FLibUCW.pm;h=2b7eb23e6b233c2218917c23b633283ed09890ed;hb=8c416794bc7282bfc03fcc0500898aa2483c338a;hp=19fcb0384e07b8c5ee6271825bc9653791d3a931;hpb=9773afa84a6ba2bdaa9acab70b27ce75c9e78c4c;p=libucw.git

diff --git a/ucw/perl/UCW/Configure/LibUCW.pm b/ucw/perl/UCW/Configure/LibUCW.pm
index 19fcb038..2b7eb23e 100644
--- a/ucw/perl/UCW/Configure/LibUCW.pm
+++ b/ucw/perl/UCW/Configure/LibUCW.pm
@@ -43,19 +43,6 @@ if (Get("CPU_ARCH") eq "default" || Get("CPU_ARCH") =~ /^i[345]86$/) {
 	Set("CONFIG_UCW_RADIX_SORTER_BITS" => 12);
 }
 
-# fb_direct needs threads
-if (!IsSet("CONFIG_UCW_THREADS")) {
-	if (IsGiven("CONFIG_DIRECT") && IsSet("CONFIG_DIRECT")) {
-		if (!IsGiven("CONFIG_UCW_THREADS")) {
-			Set("CONFIG_UCW_THREADS");
-		} else {
-			Fail("CONFIG_DIRECT needs CONFIG_UCW_THREADS");
-		}
-	} else {
-		UnSet("CONFIG_DIRECT");
-	}
-}
-
 PostConfig {
 	AtWrite {
 		UCW::Configure::C::ConfigHeader("ucw/autoconf.h", [
@@ -66,9 +53,22 @@ PostConfig {
 			'^CONFIG_' => 1,
 			'^CPU_' => 1,
 			'^(SHERLOCK|UCW)_VERSION(_|$)' => 1,
+			'^MAX_WORD_(BYTES|CHARS)$' => 1,
 
 		]);
 	} if Get("CONFIG_INSTALL_API");
+
+	# Include direct FB?
+	if (!IsSet("CONFIG_UCW_THREADS") || !IsSet("CONFIG_DIRECT_IO")) {
+		if (IsGiven("CONFIG_UCW_FB_DIRECT") && IsSet("CONFIG_UCW_FB_DIRECT")) {
+			if (!IsSet("CONFIG_UCW_THREADS")) {
+				Fail("CONFIG_UCW_FB_DIRECT needs CONFIG_UCW_THREADS");
+			} else {
+				Fail("CONFIG_UCW_FB_DIRECT needs CONFIG_DIRECT_IO");
+			}
+		}
+		UnSet("CONFIG_UCW_FB_DIRECT");
+	}
 };
 
 # We succeeded