Fixed build problem with SBCL 0.9.11

[clg] / glib / glib.asd

diff --git a/glib/glib.asd b/glib/glib.asd
index 99910c9..f6fd3e7 100644 (file)
--- a/glib/glib.asd
+++ b/glib/glib.asd
@@ -23,10 +23,44 @@
 (when (string>= (pkg-version "glib-2.0") "2.6.0")
   (push :glib2.6 *features*))
 
+(when (string>= (pkg-version "glib-2.0") "2.8.0")
+  (push :glib2.8 *features*))
+
+#+sbcl
+(progn
+  (defun sbcl-version ()
+    (let ((dot1 (position #\. (lisp-implementation-version)))
+         (dot2 (position #\. (lisp-implementation-version) :from-end t)))
+      (values 
+       (parse-integer (lisp-implementation-version) :end dot1)
+       (parse-integer (lisp-implementation-version) :start (1+ dot1) :end dot2)
+       (parse-integer (lisp-implementation-version) :start (1+ dot2)))))
+  (defun sbcl-version>= (req-major req-minor req-micro)
+    (multiple-value-bind (major minor micro) (sbcl-version)      
+      (or 
+       (> major req-major)
+       (and (= major req-major) (> minor req-minor))
+       (and (= major req-major) (= minor req-minor) (>= micro req-micro)))))
+  (when (sbcl-version>= 0 9 8)
+    (push :sbcl>=0.9.8 *features*))
+  (when (sbcl-version>= 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)
     :components ((:file "defpackage")
-                #+(and cmu (not clg-pcl))(:file "pcl")
+                #+(and cmu (not non-broken-pcl) (not cmu19b))(:file "pcl")
                 ;; For preloading to work in glib 2.6, the library needs to 
                 ;; be configured and build with '--disable-visibility'
                 (:unix-dso "preload"
@@ -47,7 +81,7 @@
                 (:file "utils" :depends-on ("defpackage"))
                 (:file "ffi" :depends-on ("utils"))
                 (:file "glib" :depends-on ("ffi" "libglib-2.0"))
-                (:file "proxy" :depends-on (#+(and cmu (not clg-pcl))"pcl" "glib"))
+                (:file "proxy" :depends-on (#+(and cmu (not non-broken-pcl) (not cmu19b))"pcl" "glib"))
                 (:file "gtype" :depends-on ("proxy" "alien" "libgobject-2.0"))
                 (:file "gboxed" :depends-on ("gtype"))
                 (:file "genums" :depends-on ("gtype"))