Improved gtk version detection

[clg] / gtk / gtk.asd

diff --git a/gtk/gtk.asd b/gtk/gtk.asd
index 34752c6abe53edfe9c54125f74e683630ecad0aa..74b40074af80cb2b68045cd1b4287bfcd9815cec 100644 (file)
--- a/gtk/gtk.asd
+++ b/gtk/gtk.asd
@@ -9,9 +9,14 @@
 
 (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*))
 
 (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"))
@@ -24,6 +29,11 @@
                 (:file "gtktypes" :depends-on ("gtkobject"))
                 (:file "gtkwidget" :depends-on ("gtktypes"))
                 (:file "gtkcontainer" :depends-on ("gtktypes"))
+                (:file "gtktree" :depends-on ("gtktypes"))
+                (:file "gtktext" :depends-on ("gtktypes"))
+                (:file "gtkaction" :depends-on ("gtktypes"))
+                (:file "gtkselection" :depends-on ("gtktypes"))
+                (:file "gtkstyle" :depends-on ("gtktypes"))
                 (:file "gtk" :depends-on ("gtktypes"))
                 (:file "gtkutils" :depends-on ("gtk"))
-                (:file "export" :depends-on ("gtktypes" "gtk"))))
+                (:file "export" :depends-on ("gtktypes" "gtkwidget" "gtkcontainer" "gtk" "gtktree" "gtkaction" "gtkselection" "gtkutils" "gtkstyle"))))