Improved gtk version detection

diff --git a/gtk/gtk.asd b/gtk/gtk.asd
index d7359a0a77093fa6e8010abdeaa5e23978b8caa3..74b40074af80cb2b68045cd1b4287bfcd9815cec 100644 (file)
--- a/gtk/gtk.asd
+++ b/gtk/gtk.asd
@@ -9,14 +9,14 @@
 
 (pkg-exists-p "gtk+-2.0" :atleast-version "2.4.0")
 
 
 (pkg-exists-p "gtk+-2.0" :atleast-version "2.4.0")
 

-(when (string>= (pkg-version "gtk+-2.0") "2.6.0")
+(when (pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0" :error nil)

   (pushnew :gtk2.6 *features*))
 
   (pushnew :gtk2.6 *features*))
 

-(when (string>= (pkg-version "gtk+-2.0") "2.8.0")
+(when (pkg-exists-p "gtk+-2.0" :atleast-version "2.8.0" :error nil)

   (pushnew :gtk2.8 *features*))
 
 (defsystem gtk
   (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"))
     :components ((:file "defpackage")
                 (:library "libgtk-x11-2.0" 
                           :libdir #.(pkg-variable "gtk+-2.0" "libdir"))