Bug fixes and some minor changes
[clg] / gdk / gdk.asd
index 738234a..4c3024a 100644 (file)
@@ -5,13 +5,10 @@
 
 (in-package "GDK-SYSTEM")
 
-(pkg-exists-p "gtk+-2.0" :atleast-version "2.4.0")
-
-(when (string>= (pkg-version "gtk+-2.0") "2.6.0")
-  (pushnew :gtk2.6 *features*))
+(pkg-exists-p "gtk+-2.0" :atleast-version "2.4.0" :error t)
 
 (defsystem gdk
-    :depends-on (glib pango)
+    :depends-on (gffi glib pango #?(pkg-exists-p "gtk+-2.0" :atleast-version "2.8.0") cairo)
     :components ((:file "defpackage")
                 (:library "libgdk_pixbuf-2.0" 
                           :libdir #.(pkg-variable "gtk+-2.0" "libdir"))
@@ -19,7 +16,8 @@
                           :libdir #.(pkg-variable "gtk+-2.0" "libdir"))
                 (:unix-dso "alien"
                            :components ((:c-source-file "glue"
-                                         :cflags #.(pkg-cflags "gtk+-2.0"))))
+                                         :cflags #.(pkg-cflags "gtk+-2.0")))
+                           :depends-on ("libgdk-x11-2.0"))
                 (:file "gdktypes" :depends-on ("defpackage" "alien" 
                                                "libgdk_pixbuf-2.0" 
                                                "libgdk-x11-2.0"))