X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/1ed0a2c57d1624d098f180bff1c567960a9b1b36..e3d7a90d85729644ca3ad1f9802ae016d2cffecd:/cairo/cairo.asd

diff --git a/cairo/cairo.asd b/cairo/cairo.asd
index d7bada9..337c5eb 100644
--- a/cairo/cairo.asd
+++ b/cairo/cairo.asd
@@ -1,18 +1,28 @@
 ;;; -*- Mode: lisp -*-
 
+(asdf:oos 'asdf:load-op :clg-tools)
+
 (defpackage "CAIRO-SYSTEM"
   (:use "COMMON-LISP" "ASDF" "PKG-CONFIG"))
 
 
 (in-package "CAIRO-SYSTEM")
 
-(pkg-exists-p "cairo" :atleast-version "1.0.2")
+(pkg-exists-p "cairo" :atleast-version "1.2.0" :error t)
 
 
 (defsystem cairo
-    :depends-on (glib)
+    :depends-on (gffi glib)
     :components ((:library "libcairo" 
-		  :libdir #.(pkg-variable "cairo" "libdir"))
+		            :libname #-win32 "libcairo" 
+			             #+win32 "libcairo-2" 
+			    :libdir #.(pkg-libdir "cairo"))
+		 (:library "libjpeg")
+		 (:shared-object "cairo-alien" :pathname "alien/"
+		  :components ((:c-source-file "cairo-jpeg" 
+				:cflags #.(pkg-cflags "cairo")))
+		  :depends-on ("libcairo" "libjpeg"))
 		 (:file "defpackage")
-		 (:file "cairo" :depends-on ("defpackage" "libcairo"))
+		 (:file "cairo" 
+		  :depends-on ("defpackage" "libcairo" "cairo-alien"))
 		 (:file "export" :depends-on ("cairo"))))