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

diff --git a/ucw/perl/UCW/Configure/LibUCW.pm b/ucw/perl/UCW/Configure/LibUCW.pm
index fe3350e4..2b7eb23e 100644
--- a/ucw/perl/UCW/Configure/LibUCW.pm
+++ b/ucw/perl/UCW/Configure/LibUCW.pm
@@ -52,10 +52,23 @@ PostConfig {
 			# Included symbols
 			'^CONFIG_' => 1,
 			'^CPU_' => 1,
-			'^SHERLOCK_VERSION_' => 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