Changeset 1059

Timestamp:

Sep 7, 2011, 4:35:48 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

OS/2: configure.cmd: Build image format plugins for shared Qt.

This is a regression of 4.7.3 (where the logic of selecting on how
to build support for image formats has been changed).

File:

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

trunk/configure.cmd

@@ -1160 +1160 @@
     if (G.CFG_GUI == "auto")    then G.CFG_GUI = "yes"
 
-    if (G.CFG_GIF == "auto")    then G.CFG_GIF = "yes"
-    if (G.CFG_TIFF == "auto")   then G.CFG_TIFF = "yes"
-    if (G.CFG_PNG == "auto")    then G.CFG_PNG = "yes"
-    if (G.CFG_JPEG == "auto")   then G.CFG_JPEG = "yes"
-    if (G.CFG_MNG == "auto")    then G.CFG_MNG = "yes"
     if (G.CFG_ZLIB == "auto")   then G.CFG_ZLIB = "yes"
 
@@ -1183 +1178 @@
     if (G.CFG_OPENSSL == "auto")        then G.CFG_OPENSSL = "yes"
     if (G.CFG_DBUS == "auto")           then G.CFG_DBUS = "yes"
+
+    /* detect how jpeg should be built */
+    if (G.CFG_JPEG == "auto") then do
+        if (G.CFG_SHARED == "yes") then
+            G.CFG_JPEG = "plugin"
+        else
+            G.CFG_JPEG = "yes"
+    end
+
+    /* detect how gif should be built */
+    if (G.CFG_GIF == "auto") then do
+        if (G.CFG_SHARED == "yes") then
+            G.CFG_GIF = "plugin"
+        else
+            G.CFG_GIF = "yes"
+    end
+
+    /* detect how tiff should be built */
+    if (G.CFG_TIFF == "auto") then do
+        if (G.CFG_SHARED == "yes") then
+            G.CFG_TIFF = "plugin"
+        else
+            G.CFG_TIFF = "yes"
+    end
+
+    /* detect how mng should be built */
+    if (G.CFG_MNG == "auto") then do
+        if (G.CFG_SHARED == "yes") then
+            G.CFG_MNG = "plugin"
+        else
+            G.CFG_MNG = "yes"
+    end
 
     /* auto-detect SQL-modules support */