Dependencies updated, code removed

diff --git a/glib/glib.asd b/glib/glib.asd
index 44de186858e3988770237108491c9bda79f32a42..a12a37f30b9ae7e562acafd29cc1af51112c1246 100644 (file)
--- a/glib/glib.asd
+++ b/glib/glib.asd
@@ -1,16 +1,11 @@
 ;;; -*- Mode: lisp -*-
 
 (asdf:oos 'asdf:load-op :clg-tools)
+(asdf:oos 'asdf:load-op :gffi)
 
 (defpackage "GLIB-SYSTEM"
   (:use "COMMON-LISP" "ASDF" "PKG-CONFIG"))
 
-#+cmu(ext:unlock-all-packages)
-#+sbcl
-(progn
-  (sb-ext:unlock-package "COMMON-LISP")
-  (sb-ext:unlock-package "SB-PCL"))
-
 ;;; Better put this in ~/.cmucl-init.lisp or some other file read at startup
 ;; (setf
 ;;  (logical-pathname-translations "clg")
@@ -18,36 +13,11 @@
 
 (in-package "GLIB-SYSTEM")
 
-(pkg-exists-p "glib-2.0" :atleast-version "2.4.0")
-
-(when (pkg-exists-p "glib-2.0" :atleast-version "2.6.0" :error nil)
-  (push :glib2.6 *features*))
-
-(when (pkg-exists-p "glib-2.0" :atleast-version "2.8.0" :error nil)
-  (push :glib2.8 *features*))
-
-#+sbcl
-(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.")))
-
+(pkg-exists-p "glib-2.0" :atleast-version "2.4.0" :error t)
 
 (defsystem glib
-    :depends-on (clg-tools)
+    :depends-on (clg-tools gffi)
     :components ((:file "defpackage")
-                #+(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"
@@ -65,11 +35,8 @@
                               (:c-source-file "gobject" 
                                :cflags #.(pkg-cflags "glib-2.0")))
                  :depends-on ("libgobject-2.0"))
-                (: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 non-broken-pcl) (not cmu19b))"pcl" "glib"))
-                (:file "gtype" :depends-on ("proxy" "alien" "libgobject-2.0"))
+                (:file "glib" :depends-on ("libglib-2.0" "defpackage"))
+                (:file "gtype" :depends-on ("alien" "libgobject-2.0" "glib"))
                 (:file "gboxed" :depends-on ("gtype"))
                 (:file "genums" :depends-on ("gtype"))
                 (:file "gparam" :depends-on ("genums"))
@@ -77,4 +44,4 @@
                 (:file "ginterface" :depends-on ("gobject"))
                 (:file "gcallback" :depends-on ("gtype" "gparam" "gobject" "alien"))
                 (:file "gerror" :depends-on ("gcallback"))
-                (:file "export" :depends-on ("utils" "glib" "proxy" "gboxed" "gtype" "gparam" "gcallback" "genums" "gobject" "gerror"))))
+                (:file "export" :depends-on ("glib" "gboxed" "gtype" "gparam" "gcallback" "genums" "gobject" "gerror"))))