Changeset 577

Timestamp:

Feb 18, 2010, 2:36:28 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

configure.cmd: CUPS_INCLUDEPATH and CUPS_LIBS environment variables were actually ignored.

File:

• trunk/configure.cmd (modified) (1 diff)

trunk/configure.cmd

@@ -594 +594 @@
     /* detect the CUPS support */
 
-    call GetPkgVersionAndPath 'Peter Brown\CUPS\CUPS', 'G.CUPS'
-    if (G.CUPS.version \== '') then
-        call SayVerbose 'eCUPS version 'G.CUPS.version' detected in "'G.CUPS.path'"'
-    else
-        call SayVerbose 'eCUPS is not found.'
-
-    if (G.CUPS.version >= "1.3.11") then do
-        G.CUPS.path = FixDirNoSlash(G.CUPS.path)'\cups';
-        G.CFG_CUPS = "yes"
-        G.CUPS_INCLUDEPATH = G.CUPS.path'\include'
-        G.CUPS_LIBS = '-L'G.CUPS.path'\lib libcups.a pthread.lib'
+    G.CUPS_INCLUDEPATH = GetEnv('CUPS_INCLUDEPATH')
+    G.CUPS_LIBS = GetEnv('CUPS_LIBS')
+    if (G.CUPS_INCLUDEPATH == '' & G.CUPS_LIBS == '') then do
+        /* Check if eCUPS WPI is installed */
+        call GetPkgVersionAndPath 'Peter Brown\CUPS\CUPS', 'G.CUPS'
+        if (G.CUPS.version \== '') then
+            call SayVerbose 'eCUPS version 'G.CUPS.version' is detected in "'G.CUPS.path'"'
+        else
+            call SayVerbose 'eCUPS is not found.'
+        if (G.CUPS.version >= "1.3.11") then do
+            G.CUPS.path = FixDirNoSlash(G.CUPS.path)'\cups';
+            G.CUPS_INCLUDEPATH = G.CUPS.path'\include'
+            G.CUPS_LIBS = '-L'G.CUPS.path'\lib libcups.a pthread.lib'
+        end
+        else
+            call SayVerbose 'eCUPS version is not supported.'
+        drop G.CUPS.
+    end
+    if (G.CUPS_LIBS \== '')  then do
+        call SayVerbose 'CUPS include path : 'G.CUPS_INCLUDEPATH
+        call SayVerbose 'CUPS libraries    : 'G.CUPS_LIBS
+        G.CFG_CUPS = 'yes'
     end
     else do
-        G.CFG_CUPS = "no"
-        G.CUPS_INCLUDEPATH = ''
-        G.CUPS_LIBS = ''
-        /* so far, CUPS is the only printing system we support so disable
-         * the printer classses at all when CUPS is not available */
+        call SayVerbose 'CUPS libraries are not specified, CUPS support is disabled.'
+        G.CFG_CUPS = 'no'
+    end
+    /* so far, CUPS is the only printing system we support so disable
+     * the printer classses at all when CUPS is not available */
+    if (G.CFG_CUPS == 'no') then do
         call SaySay 'WARNING: Printing support is completely disabled due to',
-                    'missing or outdated eCUPS framework.'
+                    '.'
         G.D_FLAGS = Join(G.D_FLAGS, "QT_NO_PRINTER")
         G.QCONFIG_FLAGS = Join(G.QCONFIG_FLAGS, "QT_NO_PRINTER")