Using pkg-libdir to get library path

[clg] / cairo / cairo.asd

diff --git a/cairo/cairo.asd b/cairo/cairo.asd
index 4f015aa37d7f49f7b93ab28f38cd0d68981c2b25..6b5e1d2f37bd365779c610e12cc97bff379abe1b 100644 (file)
--- a/cairo/cairo.asd
+++ b/cairo/cairo.asd
@@ -1,18 +1,22 @@
 ;;; -*- 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" :error t)
+(pkg-exists-p "cairo" :atleast-version "1.2.0" :error t)
 
 
 (defsystem cairo
     :depends-on (gffi glib)
     :components ((:library "libcairo" 
-                 :libdir #.(pkg-variable "cairo" "libdir"))
+                           :libname #-win32 "libcairo" 
+                                    #+win32 "libcairo-2" 
+                           :libdir #.(pkg-libdir "cairo"))
                 (:file "defpackage")
                 (:file "cairo" :depends-on ("defpackage" "libcairo"))
                 (:file "export" :depends-on ("cairo"))))