X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/be5f59c8c788124159da89598441bd62bd57d642..1dfea3abdf558452687fc35f7270d55e9626de7c:/gtk/gtk.asd

diff --git a/gtk/gtk.asd b/gtk/gtk.asd
index 74b4007..c2e15a7 100644
--- a/gtk/gtk.asd
+++ b/gtk/gtk.asd
@@ -7,13 +7,7 @@
 
 (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 (gffi glib gdk pango atk)
@@ -21,9 +15,11 @@
 		 (: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"))
+;			    :depends-on ("libgtk-x11-2.0")
+			    )
 		 (:file "gtkobject" 
 			:depends-on ("defpackage" "alien"))
  		 (:file "gtktypes" :depends-on ("gtkobject"))
@@ -31,9 +27,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"))))