X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=clsql-uffi.asd;h=e3aec75c16c1d076fc1bb40cba90aa01eab33911;hp=49ae32d440e67789a9c628ef4920881755d6e97f;hb=bb71f27c241187a32c7839aea501114d65e29f85;hpb=614e68954c499aa0424c70245b4b33c8b5ba8687

diff --git a/clsql-uffi.asd b/clsql-uffi.asd
index 49ae32d..e3aec75 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)
@@ -54,23 +54,27 @@
   nil) ;;; library will be loaded by a loader file
 
 (defmethod operation-done-p ((o load-op) (c clsql-uffi-source-file))
-  nil) 
+  (and (symbol-function (intern (symbol-name '#:atol64)
+				(find-package '#:clsql-uffi)))
+       t))
 
 (defmethod perform ((o compile-op) (c clsql-uffi-source-file))
-  #-(or win32 mswindows)
-  (unless (zerop (run-shell-command
-		  #-freebsd "cd ~A; make"
-		  #+freebsd "cd ~A; gmake"
-		  (namestring (make-pathname :name nil
-					     :type nil
-					     :directory *library-file-dir*))))
-    (error 'operation-error :component c :operation o)))
+  (unless (operation-done-p o c)
+    #-(or win32 mswindows)
+    (unless (zerop (run-shell-command
+		    #-freebsd "cd ~A; make"
+		    #+freebsd "cd ~A; gmake"
+		    (namestring (make-pathname :name nil
+					       :type nil
+					       :directory *library-file-dir*))))
+      (error 'operation-error :component c :operation o))))
 
 (defmethod operation-done-p ((o compile-op) (c clsql-uffi-source-file))
-  (let ((lib (make-pathname :defaults (component-pathname c)
-			    :type (uffi:default-foreign-library-type))))
-    (and (probe-file lib)
-	 (> (file-write-date lib) (file-write-date (component-pathname c))))))
+  (or (and (probe-file #p"/usr/lib/clsql/uffi.so") t)
+      (let ((lib (make-pathname :defaults (component-pathname c)
+				:type (uffi:default-foreign-library-type))))
+	(and (probe-file lib)
+	     (> (file-write-date lib) (file-write-date (component-pathname c)))))))
   
 #+(or allegro lispworks cmu sbcl openmcl mcl scl)
 (defsystem clsql-uffi
@@ -81,12 +85,12 @@
   :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
 	    :components
-	    ((:clsql-uffi-source-file "uffi")
-	     (:file "clsql-uffi-package")
+	    ((:file "clsql-uffi-package")
+	     (:clsql-uffi-source-file "uffi" :depends-on ("clsql-uffi-package"))
 	     (:file "clsql-uffi-loader" :depends-on ("clsql-uffi-package" "uffi"))
 	     (:file "clsql-uffi" :depends-on ("clsql-uffi-loader"))))))