Improved glib version detection

[clg] / glib / glib.asd

diff --git a/glib/glib.asd b/glib/glib.asd
index 668c59b70c8a96205d31e2b715892f5cc673849a..44de186858e3988770237108491c9bda79f32a42 100644 (file)
--- a/glib/glib.asd
+++ b/glib/glib.asd
@@ -20,15 +20,29 @@
 
 (pkg-exists-p "glib-2.0" :atleast-version "2.4.0")
 
-(when (string>= (pkg-version "glib-2.0") "2.6.0")
+(when (pkg-exists-p "glib-2.0" :atleast-version "2.6.0" :error nil)
   (push :glib2.6 *features*))
 
-(when (string>= (pkg-version "glib-2.0") "2.8.0")
+(when (pkg-exists-p "glib-2.0" :atleast-version "2.8.0" :error nil)
   (push :glib2.8 *features*))
 
 #+sbcl
-(when (string>= (lisp-implementation-version) "0.9.8")
-  (push :sbcl>=0.9.8 *features*))
+(progn
+  (when (sbcl>= 0 9 8)
+    (push :sbcl>=0.9.8 *features*))
+  (when (sbcl>= 0 9 10)
+    (push :sbcl>=0.9.10 *features*)))
+
+#+(and sbcl (not alien-callbacks))
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (unless (find-symbol "DEFINE-ALIEN-FUNCTION" "SB-ALIEN")
+    (error "You need to upgrade SBCL to a version with native C callback support or see the README file about how to add third party callbacks to your current SBCL version.")))
+
+#+(and sbcl alien-callbacks)
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (when (find-symbol "DEFINE-ALIEN-FUNCTION" "SB-ALIEN")
+    (error "Third party C callback code detected in a SBCL image with native callback support. As clg now uses native callbacks when available, you need to use a \"clean\" core file.")))
+
 
 (defsystem glib
     :depends-on (clg-tools)