Fixed previous broken change to DEFBINDING

[clg] / glib / glib.asd

diff --git a/glib/glib.asd b/glib/glib.asd
index c779bec03c73b41760948abeb50e077af7d0bc43..99910c9583dcaa4875b8691efada6a3ff3a4ca2b 100644 (file)
--- a/glib/glib.asd
+++ b/glib/glib.asd
@@ -5,7 +5,11 @@
 (defpackage "GLIB-SYSTEM"
   (:use "COMMON-LISP" "ASDF" "PKG-CONFIG"))
 
-(ext:unlock-all-packages)
+#+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
@@ -16,38 +20,40 @@
 
 (pkg-exists-p "glib-2.0" :atleast-version "2.4.0")
 
-(defvar *cmucl-include-path* "/usr/lib/cmucl/include")
-
+(when (string>= (pkg-version "glib-2.0") "2.6.0")
+  (push :glib2.6 *features*))
 
 (defsystem glib
     :depends-on (clg-tools)
     :components ((:file "defpackage")
-                (:file "pcl")
-                ;; It is necessary to load this before libglib-2.0.so,
-                ;; otherwise our implementation of g_logv won't be
-                ;; used by the library
-                (: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"))))
+                #+(and cmu (not clg-pcl))(: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 ("alien"))
+                           :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"
+                               :cflags #.(pkg-cflags "glib-2.0"))
+                              (: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 ("pcl" "glib"))
-                (:file "gtype" :depends-on ("proxy" "libgobject-2.0"))
+                (:file "proxy" :depends-on (#+(and cmu (not clg-pcl))"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 "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"))))