X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=clsql-uffi.asd;h=51eb3f1239900ee8e0fb857f82cc2d49f2ff616a;hp=18fcf002e3d1228527541c1f9f9a02bf6316442c;hb=8032ca50e601511d03908b6d20c7fd3fb9725437;hpb=afc88420d03b627b214473078c3adc201de2de80

diff --git a/clsql-uffi.asd b/clsql-uffi.asd
index 18fcf00..51eb3f1 100644
--- a/clsql-uffi.asd
+++ b/clsql-uffi.asd
@@ -20,8 +20,8 @@
 
 ;; need to load uffi for below output-files method 
 (eval-when (:compile-toplevel :load-toplevel :execute)
-  #+common-lisp-controller (require 'uffi)
-  #-common-lisp-controller (asdf:operate 'asdf:load-op 'uffi))
+  (unless (find-package 'uffi)
+    (asdf:operate 'asdf:load-op 'uffi)))
 
 (defpackage clsql-uffi-system (:use #:asdf #:cl))
 (in-package clsql-uffi-system)
@@ -70,13 +70,12 @@
       (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)
+	(and (probe-file lib) (probe-file (component-pathname c))
 	     (> (file-write-date lib) (file-write-date (component-pathname c)))))))
   
-#+(or allegro lispworks cmu sbcl openmcl mcl scl)
 (defsystem clsql-uffi
   :name "cl-sql-base"
   :author "Kevin M. Rosenberg <kmr@debian.org>"
@@ -85,7 +84,7 @@
   :description "Common UFFI Helper functions for Common Lisp SQL Interface Library"
   :long-description "cl-sql-uffi package provides common helper functions using the UFFI for the CLSQL package."
 
-  :depends-on (uffi clsql-base)
+  :depends-on (uffi clsql)
   
   :components
   ((:module :uffi