Loading of shared library doen by defsystem

diff --git a/atk/atk.asd b/atk/atk.asd
index 67e9b609956e6c9fe519c7b5763bdd950518ec18..e46949b0eaf354861867497096b867b08e6ac7c6 100644 (file)
--- a/atk/atk.asd
+++ b/atk/atk.asd
@@ -1,17 +1,18 @@
 ;;; -*- Mode: lisp -*-
 
 (defpackage "ATK-SYSTEM"
 ;;; -*- Mode: lisp -*-
 
 (defpackage "ATK-SYSTEM"

-  (:use "COMMON-LISP" "ASDF" "PKG-CONFIG" "SHAREDLIB"))
+  (:use "COMMON-LISP" "ASDF" "PKG-CONFIG"))

 
 
 (in-package "ATK-SYSTEM")
 
 (pkg-exists-p "atk" :atleast-version "1.6.0")
 
 
 
 (in-package "ATK-SYSTEM")
 
 (pkg-exists-p "atk" :atleast-version "1.6.0")
 

-(sharedlib:load-shared-library "libatk-1.0")

 
 (defsystem atk
 
 (defsystem atk

-    :depends-on (glib)
-    :components ((:file "defpackage")
-                (:file "atk" :depends-on ("defpackage"))
+    :depends-on (glib gdk)
+    :components ((:library "libatk-1.0"
+                          :libdir #.(pkg-variable "atk" "libdir"))
+                (:file "defpackage")
+                (:file "atk" :depends-on ("defpackage" "libatk-1.0"))

                 (:file "export" :depends-on ("atk"))))
                 (:file "export" :depends-on ("atk"))))

diff --git a/atk/atk.lisp b/atk/atk.lisp
index 1c38106a82374818f64ccd862eb107392b52b138..ee06f6f9ef8b8d4b2fc78e02fd86753fa7bf7fe1 100644 (file)
--- a/atk/atk.lisp
+++ b/atk/atk.lisp
@@ -15,11 +15,12 @@
 ;; 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: atk.lisp,v 1.2 2002/03/19 17:15:05 espen Exp $
+;; $Id: atk.lisp,v 1.3 2004/10/31 11:44:45 espen Exp $

 
 (in-package "ATK")
 
 
 (in-package "ATK")
 

+

 (eval-when (:compile-toplevel :load-toplevel :execute)
 (eval-when (:compile-toplevel :load-toplevel :execute)

-  (init-types-in-library "libatk-1.0.so")
+  (init-types-in-library "libatk-1.0.so"))

 
 

-  (define-types-by-introspection "Atk"))
+(define-types-by-introspection "Atk")