X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/2518e203b1a0de56b52e725448a8d12f98db3c76..fa30048e45d3d71f09ac0b963f7cc7d1c7769475:/glib/glib.asd

diff --git a/glib/glib.asd b/glib/glib.asd
index b2b270d..a12a37f 100644
--- 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,15 +13,11 @@
 
 (in-package "GLIB-SYSTEM")
 
-(pkg-exists-p "glib-2.0" :atleast-version "2.4.0")
-
-(when (string>= (pkg-version "glib-2.0") "2.6.0")
-  (push :glib2.6 *features*))
+(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"
@@ -44,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"))
@@ -56,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"))))