Changeset 789

Timestamp:

Oct 10, 2010, 9:39:23 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

configure.cmd: Do not require to install the CUPS WPI, suggest ZIP instead.

Location:

trunk

Files:

• README.OS2 (modified) (3 diffs)
• configure.cmd (modified) (1 diff)

trunk/README.OS2

@@ -60 +60 @@
       http://www.os2site.com/sw/util/archiver/lxlt133.zip
 
-  - eCUPS 1.3.11 or later to support printing in Qt. The eCUPS WPI is available
-    from:
-
-      ftp://ftp.netlabs.org/incoming/eCUPS003.wpi   or
-      ftp://ftp.netlabs.org/pub/ecups/eCUPS003.wpi
+  - CUPS 1.3.11 or later to support printing in Qt. The CUPS libraries are
+    available at:
+
+      http://download.smedley.info/cups-1.3.11-os2-20090807.zip
 
     Linking against eCUPS also requires pthread.lib:
@@ -78 +77 @@
       or
 
+      http://bauxite.sakura.ne.jp/tmp/os2/openssl-1.0.0a-os2knix-20100706-runtime.zip
       http://bauxite.sakura.ne.jp/tmp/os2/openssl-1.0.0a-os2knix-20100706-dev.zip
-      http://bauxite.sakura.ne.jp/tmp/os2/openssl-1.0.0a-os2knix-20100706-runtime.zip
 
 
@@ -157 +156 @@
 that the Qt library depends on:
 
-  - Install the eCUPS WPI archive to enable printing support. If this WPI is
-    installed, the Qt build system will pick up all necessary libraries
-    automatically. Otherwise (e.g. if you use a ZIP or build eCUPS yourself),
-    you will need to use the following environment variables to tell it where to
-    look for CUPS:
-
-      set CUPS_INCLUDEPATH=X:\Path\to\CUPS\include
-      set CUPS_LIBS=X:\Path\to\CUPS\lib\libcups.a
-
-    You will also need to make sure that pthread.lib is placed somewhere in your
-    system library path so that the compiler can find it.
+  - Unzip the CUPS libraries to some directory and set the following environment
+    variables to tell the Qt configure script its location:
+
+      set CUPS_INCLUDEPATH=X:\<path_to_CUPS>\include
+      set CUPS_LIBS=-LX:\<path_to_CUPS>\lib -llibcups.a -L<path_to_pthread> -lpthread.lib
 
   - Unzip the OpenSSL libraries to some directory and set the following

trunk/configure.cmd

@@ -600 +600 @@
     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_INCLUDEPATH \== '' & G.CUPS_LIBS \== '') then do
         call SayVerbose 'CUPS include path : 'G.CUPS_INCLUDEPATH