X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=clsql-uffi.asd;h=5629d45b5c3a80d12cdae7afd5295da0507d6927;hp=19b9fb4ce44afbd342b35a4026c86998b9a6902f;hb=91eb9f3d1335fed9ee9e4644eacca2b97db30836;hpb=78489032c6f66ce666ffe5e2e726503b61b94616

diff --git a/clsql-uffi.asd b/clsql-uffi.asd
index 19b9fb4..5629d45 100644
--- a/clsql-uffi.asd
+++ b/clsql-uffi.asd
@@ -7,9 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Aug 2002
 ;;;;
-;;;; $Id$
-;;;;
-;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
+;;;; This file, part of CLSQL, is Copyright (c) 2002-2010 by Kevin M. Rosenberg
 ;;;;
 ;;;; CLSQL users are granted the rights to distribute and use this software
 ;;;; as governed by the terms of the Lisp Lesser GNU Public License
@@ -50,16 +48,17 @@
   nil) ;;; library will be loaded by a loader file
 
 (defmethod operation-done-p ((o load-op) (c clsql-uffi-source-file))
-  (and (symbol-function (intern (symbol-name '#:atol64)
+  (and (find-package '#:clsql-uffi)
+       (symbol-function (intern (symbol-name '#:atol64)
 				(find-package '#:clsql-uffi)))
        t))
 
 (defmethod perform ((o compile-op) (c clsql-uffi-source-file))
   (unless (operation-done-p o c)
-    #-(or win32 mswindows)
+    #-(or win32 win64 windows mswindows)
     (unless (zerop (run-shell-command
-		    #-freebsd "cd ~A; make"
-		    #+freebsd "cd ~A; gmake"
+		    #-(or freebsd netbsd) "cd ~A; make"
+		    #+(or freebsd netbsd) "cd ~A; gmake"
 		    (namestring *clsql-uffi-library-dir*)))
       (error 'operation-error :component c :operation o))))
 
@@ -70,7 +69,7 @@
                                                        (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
   :name "cl-sql-base"
   :author "Kevin M. Rosenberg <kmr@debian.org>"
@@ -79,8 +78,9 @@
   :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)
-  
+  :depends-on (clsql #-:clsql-cffi (:version uffi "2.0")
+                     #+:clsql-cffi cffi-uffi-compat)
+
   :components
   ((:module :uffi
 	    :components