commit f061f76704ce983220dc549d1d66ef787cda2daa
author Marcus Meissner <marcus@jet.franken.de> Tue Nov 12 02:22:24 2002 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Nov 12 02:22:24 2002 +0000
tree ee382c8345df5d4a9ac3c072925f48b113bfd124
parent bd4a385c7e2ccd3d0867f4a597833273b36cfdf1

Do not link against -lcups directly, but dynamically load it if
present (just like freetype etc.)

dlls/wineps/init.c

diff --git a/dlls/wineps/init.c b/dlls/wineps/init.c
index e8cabb1..fa6e9da 100644
--- a/dlls/wineps/init.c
+++ b/dlls/wineps/init.c
@@ -20,6 +20,7 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
 
 #include <string.h>
 #ifdef HAVE_UNISTD_H
@@ -33,11 +34,17 @@
 #include "winspool.h"
 #include "winerror.h"
 
-#ifdef HAVE_CUPS
-# include <cups/cups.h>
+WINE_DEFAULT_DEBUG_CHANNEL(psdrv);
+
+#ifdef HAVE_CUPS_CUPS_H
+#include <cups/cups.h>
+
+#ifndef CUPS_SONAME
+#define CUPS_SONAME "libcups.so"
 #endif
 
-WINE_DEFAULT_DEBUG_CHANNEL(psdrv);
+static void *cupshandle = NULL;
+#endif
 
 static PSDRV_DEVMODEA DefaultDevmode =
 {
@@ -127,12 +134,25 @@
 		HeapDestroy(PSDRV_Heap);
 		return FALSE;
 	    }
+#ifdef HAVE_CUPS_CUPS_H
+	    /* dynamically load CUPS if not yet loaded */
+	    if (!cupshandle) {
+		cupshandle = wine_dlopen(CUPS_SONAME, RTLD_NOW, NULL, 0);
+		if (!cupshandle) cupshandle = (void*)-1;
+	    }
+#endif
             break;
 
 	case DLL_PROCESS_DETACH:
 
 	    DeleteObject( PSDRV_DefaultFont );
 	    HeapDestroy( PSDRV_Heap );
+#ifdef HAVE_CUPS_CUPS_H
+	    if (cupshandle && (cupshandle != (void*)-1)) {
+		wine_dlclose(cupshandle, NULL, 0);
+		cupshandle = NULL;
+	    }
+#endif
             break;
     }
 
@@ -491,24 +511,28 @@
 	goto cleanup;
     }
 
-#ifdef HAVE_CUPS
-    {
-	ppd = cupsGetPPD(name);
+#ifdef HAVE_CUPS_CUPS_H
+    if (cupshandle != (void*)-1) {
+	typeof(cupsGetPPD) * pcupsGetPPD = NULL;
 
-	if (ppd) {
-	    needed=strlen(ppd)+1;
-	    ppdFileName=HeapAlloc(PSDRV_Heap, 0, needed);
-	    memcpy(ppdFileName, ppd, needed);
-	    ppdType=REG_SZ;
-	    res = ERROR_SUCCESS;
-	    /* we should unlink() that file later */
-	} else {
-	    res = ERROR_FILE_NOT_FOUND;
-	    WARN("Did not find ppd for %s\n",name);
+	pcupsGetPPD = wine_dlsym(cupshandle, "cupsGetPPD", NULL, 0);
+	if (pcupsGetPPD) {
+	    ppd = pcupsGetPPD(name);
+
+	    if (ppd) {
+		needed=strlen(ppd)+1;
+		ppdFileName=HeapAlloc(PSDRV_Heap, 0, needed);
+		memcpy(ppdFileName, ppd, needed);
+		ppdType=REG_SZ;
+		res = ERROR_SUCCESS;
+		/* we should unlink() that file later */
+	    } else {
+		res = ERROR_FILE_NOT_FOUND;
+		WARN("Did not find ppd for %s\n",name);
+	    }
 	}
     }
 #endif
-
     if (!ppdFileName) {
         res = GetPrinterDataA(hPrinter, "PPD File", NULL, NULL, 0, &needed);
         if ((res==ERROR_SUCCESS) || (res==ERROR_MORE_DATA)) {