Added gerror.lisp

diff --git a/glib/export.lisp b/glib/export.lisp
index 3cd2a405f8ab07c2d6b75b1d38153caf70fce2a6..e5c9d3cef7e5a807fdad61718c728fa07ba9b929 100644 (file)
--- a/glib/export.lisp
+++ b/glib/export.lisp
@@ -15,7 +15,7 @@
 ;; License along with this library; if not, write to the Free Software
 ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 ;; License along with this library; if not, write to the Free Software
 ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 

-;; $Id: export.lisp,v 1.3 2005/02/10 20:24:25 espen Exp $
+;; $Id: export.lisp,v 1.4 2005/02/14 00:40:38 espen Exp $

 
 
 ;;; Autogenerating exported symbols
 
 
 ;;; Autogenerating exported symbols


@@ -55,3 +55,4 @@ (export-from-file #p"clg:glib;gcallback.lisp")
 (export-from-file #p"clg:glib;ginterface.lisp")
 (export-from-file #p"clg:glib;gobject.lisp")
 (export-from-file #p"clg:glib;genums.lisp")
 (export-from-file #p"clg:glib;ginterface.lisp")
 (export-from-file #p"clg:glib;gobject.lisp")
 (export-from-file #p"clg:glib;genums.lisp")

+(export-from-file #p"clg:glib;gerror.lisp")

diff --git a/glib/glib.asd b/glib/glib.asd
index 814930c2f956a8542ec869bf2b229b0631eb12ff..99910c9583dcaa4875b8691efada6a3ff3a4ca2b 100644 (file)
--- a/glib/glib.asd
+++ b/glib/glib.asd
@@ -20,15 +20,21 @@
 
 (pkg-exists-p "glib-2.0" :atleast-version "2.4.0")
 
 
 (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")
 
 (defsystem glib
     :depends-on (clg-tools)
     :components ((:file "defpackage")

-                #+cmu(:file "pcl")
+                #+(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" 
                 (:library "libglib-2.0" 

-                           :libdir #.(pkg-variable "glib-2.0" "libdir"))
+                           :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"))
                 (:library "libgobject-2.0" 
                            :libdir #.(pkg-variable "glib-2.0" "libdir")
                            :depends-on ("libglib-2.0"))


@@ -41,7 +47,7 @@
                 (:file "utils" :depends-on ("defpackage"))
                 (:file "ffi" :depends-on ("utils"))
                 (:file "glib" :depends-on ("ffi" "libglib-2.0"))
                 (:file "utils" :depends-on ("defpackage"))
                 (:file "ffi" :depends-on ("utils"))
                 (:file "glib" :depends-on ("ffi" "libglib-2.0"))

-                (:file "proxy" :depends-on (#+cmu"pcl" "glib"))
+                (: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 "gtype" :depends-on ("proxy" "alien" "libgobject-2.0"))
                 (:file "gboxed" :depends-on ("gtype"))
                 (:file "genums" :depends-on ("gtype"))


@@ -49,4 +55,5 @@
                 (:file "gobject" :depends-on ("gparam"))
                 (:file "ginterface" :depends-on ("gobject"))
                 (:file "gcallback" :depends-on ("gtype" "gparam" "gobject" "alien"))
                 (: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"))))