X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/12cdb795c95e5db1636116f88d77033c5adbf697..e4143920ea3bffef43cd27f671a1f498107d758a:/gdk/gdk.asd

diff --git a/gdk/gdk.asd b/gdk/gdk.asd
index 6188254..4c3024a 100644
--- a/gdk/gdk.asd
+++ b/gdk/gdk.asd
@@ -5,16 +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*))
-
-(when (string>= (pkg-version "gtk+-2.0") "2.8.0")
-  (pushnew :gtk2.8 *features*))
+(pkg-exists-p "gtk+-2.0" :atleast-version "2.4.0" :error t)
 
 (defsystem gdk
-    :depends-on (glib pango #+gtk2.8 cairo)
+    :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"))
@@ -22,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"))