PATCH: cups soname

[Marcus Meissner <meissner@suse.de>]

Hi,

I was using the wrong define for the CUPS soname. I did not find the
problem due to having cups-devel installed most of the time :/

Ciao, Marcus

Index: dlls/wineps/init.c
===================================================================
RCS file: /home/wine/wine/dlls/wineps/init.c,v
retrieving revision 1.45
diff -u -r1.45 init.c
--- dlls/wineps/init.c	14 Jan 2003 23:43:42 -0000	1.45
+++ dlls/wineps/init.c	7 Mar 2003 10:29:02 -0000
@@ -41,8 +41,8 @@
 #ifdef HAVE_CUPS_CUPS_H
 #include <cups/cups.h>
 
-#ifndef CUPS_SONAME
-#define CUPS_SONAME "libcups.so"
+#ifndef SONAME_LIBCUPS
+#define SONAME_LIBCUPS "libcups.so"
 #endif
 
 static void *cupshandle = NULL;
@@ -139,7 +139,7 @@
 #ifdef HAVE_CUPS_CUPS_H
 	    /* dynamically load CUPS if not yet loaded */
 	    if (!cupshandle) {
-		cupshandle = wine_dlopen(CUPS_SONAME, RTLD_NOW, NULL, 0);
+		cupshandle = wine_dlopen(SONAME_LIBCUPS, RTLD_NOW, NULL, 0);
 		if (!cupshandle) cupshandle = (void*)-1;
 	    }
 #endif
Index: dlls/winspool/info.c
===================================================================
RCS file: /home/wine/wine/dlls/winspool/info.c,v
retrieving revision 1.72
diff -u -r1.72 info.c
--- dlls/winspool/info.c	12 Feb 2003 21:27:27 -0000	1.72
+++ dlls/winspool/info.c	7 Mar 2003 10:29:02 -0000
@@ -32,8 +32,8 @@
 #include <stddef.h>
 #ifdef HAVE_CUPS_CUPS_H
 # include <cups/cups.h>
-# ifndef CUPS_SONAME
-#  define CUPS_SONAME "libcups.so"
+# ifndef SONAME_LIBCUPS
+#  define SONAME_LIBCUPS "libcups.so"
 # endif
 #endif
 
@@ -157,7 +157,7 @@
     PWSTR pwstrNameW;
     HKEY hkeyPrinters, hkeyPrinter;
 
-    cupshandle = wine_dlopen(CUPS_SONAME, RTLD_NOW, NULL, 0);
+    cupshandle = wine_dlopen(SONAME_LIBCUPS, RTLD_NOW, NULL, 0);
     if (!cupshandle) 
 	return FALSE;