X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/5fcb00f968094d61e0fe727e3817f4dbf731443f..c78ef85cf5ee71d4a7bac409ed544949fe73b53c:/gtk/gtk.asd

diff --git a/gtk/gtk.asd b/gtk/gtk.asd
index 624696b..1518884 100644
--- a/gtk/gtk.asd
+++ b/gtk/gtk.asd
@@ -7,20 +7,15 @@
 
 (in-package "GTK-SYSTEM")
 
-(pkg-exists-p "gtk+-2.0" :atleast-version "2.4.0")
-
-(when (pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0" :error nil)
-  (pushnew :gtk2.6 *features*))
-
-(when (pkg-exists-p "gtk+-2.0" :atleast-version "2.8.0" :error nil)
-  (pushnew :gtk2.8 *features*))
+(pkg-exists-p "gtk+-2.0" :atleast-version "2.4.0" :error t)
 
 (defsystem gtk
-    :depends-on (glib gdk pango atk)
+    :depends-on (gffi glib gdk pango atk)
     :components ((:file "defpackage")
 		 (:library "libgtk-x11-2.0" 
 			   :libdir #.(pkg-variable "gtk+-2.0" "libdir"))
 		 (:unix-dso "alien"
+			    :ldflags #.(pkg-libs "gtk+-2.0")
 			    :components ((:c-source-file "glue"
 					  :cflags #.(pkg-cflags "gtk+-2.0")))
 			    :depends-on ("libgtk-x11-2.0"))
@@ -31,9 +26,9 @@
 		 (:file "gtkcontainer" :depends-on ("gtktypes"))
 		 (:file "gtktree" :depends-on ("gtktypes"))
 		 (:file "gtktext" :depends-on ("gtktypes"))
-		 (:file "gtkaction" :depends-on ("gtktypes"))
+		 (:file "gtkaction" :depends-on ("gtktypes" "gtk"))
 		 (:file "gtkselection" :depends-on ("gtktypes"))
 		 (:file "gtkstyle" :depends-on ("gtktypes"))
-		 (:file "gtk" :depends-on ("gtktypes"))
+		 (:file "gtk" :depends-on ("gtktypes" "gtkcontainer"))
 		 (:file "gtkutils" :depends-on ("gtk"))
 		 (:file "export" :depends-on ("gtktypes" "gtkwidget" "gtkcontainer" "gtk" "gtktree" "gtkaction" "gtkselection" "gtkutils" "gtkstyle"))))