110924 - Allow for providing a fallback cairo library for distributions without cairo

1 files changed, 14 insertions, 1 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/Cairo.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/Cairo.java
index 41842061e3..363b22fa20 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/Cairo.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/Cairo.java
@@ -20,10 +20,23 @@
  * ***** END LICENSE BLOCK ***** */
 package org.eclipse.swt.internal.cairo;
 
-import org.eclipse.swt.internal.Library;
+import org.eclipse.swt.internal.*;
+import org.eclipse.swt.internal.gtk.*;
 
 public class Cairo {
 	static {
+		// Check if cairo is available on the system.
+		byte[] libcairo = Converter.wcsToMbcs(null, "libcairo.so.2", true);
+		int /*long*/ libcairo_handle = OS.dlopen(libcairo, 1);
+		if (libcairo_handle != 0) {
+			OS.dlclose(libcairo_handle);
+		} else {
+			try {
+				System.loadLibrary("cairo-swt");
+			} catch (UnsatisfiedLinkError e) {
+				// Ignore problems loading the fallback library.
+			}
+		}
 		Library.loadLibrary("swt-cairo");
 	}