X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=clsql-uffi.asd;h=48372a1cff433b5060ae08a564e0f355c5108045;hp=ad9f93f47c6ec0a314f9c2ba5f59a52469f534e8;hb=fd2493718d0e1114fcbe3dd578dab658ea383e81;hpb=d9f41af62750c622945bb17b622a39689ee5b840

diff --git a/clsql-uffi.asd b/clsql-uffi.asd
index ad9f93f..48372a1 100644
--- a/clsql-uffi.asd
+++ b/clsql-uffi.asd
@@ -18,11 +18,6 @@
 
 (in-package cl-user)
 
-;; need to load uffi for below output-files method 
-(eval-when (:compile-toplevel :load-toplevel :execute)
-  (unless (find-package 'uffi)
-    (asdf:operate 'asdf:load-op 'uffi)))
-
 (defpackage clsql-uffi-system (:use #:asdf #:cl))
 (in-package clsql-uffi-system)
 
@@ -70,10 +65,11 @@
       (error 'operation-error :component c :operation o))))
 
 (defmethod operation-done-p ((o compile-op) (c clsql-uffi-source-file))
-  (or (and (probe-file #p"/usr/lib/clsql/uffi.so") t)
+  (or (and (probe-file #p"/usr/lib/clsql/clsql_uffi.so") t)
       (let ((lib (make-pathname :defaults (component-pathname c)
-				:type (uffi:default-foreign-library-type))))
-	(and (probe-file lib)
+				:type (funcall (intern (symbol-name '#:default-foreign-library-type)
+                                                       (find-package '#:uffi))))))
+	(and (probe-file lib) (probe-file (component-pathname c))
 	     (> (file-write-date lib) (file-write-date (component-pathname c)))))))
   
 (defsystem clsql-uffi
@@ -90,6 +86,6 @@
   ((:module :uffi
 	    :components
 	    ((:file "clsql-uffi-package")
-	     (:clsql-uffi-source-file "uffi" :depends-on ("clsql-uffi-package"))
-	     (:file "clsql-uffi-loader" :depends-on ("clsql-uffi-package" "uffi"))
+	     (:clsql-uffi-source-file "clsql_uffi" :depends-on ("clsql-uffi-package"))
+	     (:file "clsql-uffi-loader" :depends-on ("clsql-uffi-package" "clsql_uffi"))
 	     (:file "clsql-uffi" :depends-on ("clsql-uffi-loader"))))))