r10899: Automated commit for Debian build of clsql upstream-version-3.5.5

[clsql.git] / clsql-uffi.asd

diff --git a/clsql-uffi.asd b/clsql-uffi.asd
index 51eb3f1239900ee8e0fb857f82cc2d49f2ff616a..48372a1cff433b5060ae08a564e0f355c5108045 100644 (file)
--- 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)
 
@@ -72,7 +67,8 @@
 (defmethod operation-done-p ((o compile-op) (c clsql-uffi-source-file))
   (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))))
+                               :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)))))))
   
@@ -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"))))))