Added MAX_WORD_BYTES and MAX_WORD_CHARS to ucw/autoconf.h .

[libucw.git] / ucw / perl / UCW / Configure / LibUCW.pm

diff --git a/ucw/perl/UCW/Configure/LibUCW.pm b/ucw/perl/UCW/Configure/LibUCW.pm
index 19fcb0384e07b8c5ee6271825bc9653791d3a931..2b7eb23e6b233c2218917c23b633283ed09890ed 100644 (file)
--- 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