Changeset 876 for trunk

Timestamp:

Jun 30, 2011, 3:49:54 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

configure.cmd: More dependencies on the CFG_GUI setting.

File:

• trunk/configure.cmd (modified) (4 diffs)

trunk/configure.cmd

@@ -255 +255 @@
     G.CFG_MULTIMEDIA = "auto"
     G.CFG_AUDIO_BACKEND = "auto"
-    G.CFG_SVG = "yes"
+    G.CFG_SVG = "auto"
     G.CFG_DECLARATIVE = "auto"
     G.CFG_DECLARATIVE_DEBUG = "yes"
@@ -482 +482 @@
     if (G.CFG_QCONFIG \== "full" & G.CFG_QT3SUPPORT == "yes") then do
         call SayLog "Warning: '-qconfig "G.CFG_QCONFIG"' will disable the qt3support library."
+        G.CFG_QT3SUPPORT = "no"
+    end
+
+    if (G.CFG_GUI == "no") then do
+        call SayLog "Warning: -no-gui will disable the qt3support library."
         G.CFG_QT3SUPPORT = "no"
     end
@@ -1082 +1087 @@
     end
 
+    if (G.CFG_MULTIMEDIA == "auto") then
+        CFG_MULTIMEDIA = G.CFG_GUI
+
+    if (G.CFG_MULTIMEDIA == "yes" & G.CFG_GUI == "no") then do
+        call SayErr "ERROR: QtMultimedia was requested, but it can't be",
+                    "built without QtGui."
+        call Done 1
+    end
+
+    if (G.CFG_SVG == "auto") then
+        G.CFG_SVG = G.CFG_GUI
+
+    if (G.CFG_SVG == "yes" & G.CFG_GUI == "no") then do
+        call SayErr "ERROR: QtSvg was requested, but it can't be",
+                    "built without QtGui."
+        call Done 1
+    end
+
     if (G.CFG_SCRIPT == "auto") then
         G.CFG_SCRIPT = "yes"
@@ -1116 +1139 @@
 
     if (G.CFG_WEBKIT == "auto") then do
-        if (G.OfficialBuild) then
-            G.CFG_WEBKIT = "yes"
+        if (G.CFG_GUI == "no") then
+            G.CFG_WEBKIT == "no"
         else do
-            G.CFG_WEBKIT = "no"
-            call SaySay G.EOL||,
+            if (G.OfficialBuild) then
+                G.CFG_WEBKIT = "yes"
+            else do
+                G.CFG_WEBKIT = "no"
+                call SaySay G.EOL||,
 'Qt comes with the webkit module that provides a powerful framework for web-'G.EOL||,
 'based applications and may be required by some of them but it takes a very 'G.EOL||,
 'long time to compile and build (it will double the overall compilation time).'
-            if (GetYesNo('Do you want to enable the webkit module?', 'N')) then do
-                G.CFG_WEBKIT = "yes"
+                if (GetYesNo('Do you want to enable the webkit module?', 'N')) then do
+                    G.CFG_WEBKIT = "yes"
+                end
             end
         end