X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/f11b84f65d5cd48eb93fe7738d43c264ac73ca5f..a7d19b2a6d3e11b28842476b80ef68d81fb6b8ac:/glib/glib.asd

diff --git a/glib/glib.asd b/glib/glib.asd
index 58be07e..5c18f0b 100644
--- a/glib/glib.asd
+++ b/glib/glib.asd
@@ -3,49 +3,75 @@
 (asdf:oos 'asdf:load-op :clg-tools)
 
 (defpackage "GLIB-SYSTEM"
-  (:use "COMMON-LISP" "ASDF" "PKG-CONFIG" "SHAREDLIB")
-  (:export "*GTK-LIBRARY-PATH*"))
+  (: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")
 ;;  '(("**;*.*.*" "/home/espen/src/clg/**/")))
 
-(ext:unlock-all-packages)
-
 (in-package "GLIB-SYSTEM")
 
 (pkg-exists-p "glib-2.0" :atleast-version "2.4.0")
 
-(defvar *cmucl-include-path* "/usr/lib/cmucl/include")
-(defvar *gtk-library-path* (pkg-variable "gtk+-2.0" "libdir"))
+(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
+(when (string>= (lisp-implementation-version) "0.9.8")
+  (push :sbcl>=0.9.8 *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.")))
 
-(load-shared-library "libglib-2.0")
-(load-shared-library "libgobject-2.0" :init "g_type_init")
+#+(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")
-		 (: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"
+  		  :components ((:c-source-file "logging"
+  				:cflags #.(pkg-cflags "glib-2.0"))))
+		 (:library "libglib-2.0" 
+			    :libdir #.(pkg-variable "glib-2.0" "libdir")
+ 			    :depends-on ("preload"))
+		 (:library "libgobject-2.0" 
+			    :libdir #.(pkg-variable "glib-2.0" "libdir")
+			    :depends-on ("libglib-2.0"))
 		 (:unix-dso "alien"
 		  :components ((:c-source-file "callback"
-				:definitions ("CMUCL")
-				:include-paths (#.*cmucl-include-path*)
 				:cflags #.(pkg-cflags "glib-2.0"))
 			       (:c-source-file "gobject" 
-				:cflags #.(pkg-cflags "glib-2.0"))))
+				:cflags #.(pkg-cflags "glib-2.0")))
+		  :depends-on ("libgobject-2.0"))
 		 (:file "utils" :depends-on ("defpackage"))
-		 (:file "ffi" :depends-on ("utils" "alien"))
-		 (:file "glib" :depends-on ("ffi"))
-		 (:file "proxy" :depends-on ("pcl" "glib"))
-		 (:file "gtype" :depends-on ("proxy"))
+		 (: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 "gboxed" :depends-on ("gtype"))
 		 (:file "genums" :depends-on ("gtype"))
 		 (:file "gparam" :depends-on ("genums"))
-		 (:file "ginterface" :depends-on ("gtype"))
 		 (:file "gobject" :depends-on ("gparam"))
+		 (:file "ginterface" :depends-on ("gobject"))
 		 (:file "gcallback" :depends-on ("gtype" "gparam" "gobject" "alien"))
-		 (:file "export" :depends-on ("utils" "glib" "proxy" "gboxed" "gtype" "gparam" "gcallback" "genums" "gobject"))))
+		 (:file "gerror" :depends-on ("gcallback"))
+		 (:file "export" :depends-on ("utils" "glib" "proxy" "gboxed" "gtype" "gparam" "gcallback" "genums" "gobject" "gerror"))))