X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=clsql.asd;h=d469b95de3baa112122893ddc28e82080d75e93c;hp=29e2f38bf55d7835402837963faeee29ff297f29;hb=906d7a71b35ee1cd6d281623694bc90ced22c339;hpb=56a0b7f90d30e321ca7e95f15dab3c43bd551e3f

diff --git a/clsql.asd b/clsql.asd
index 29e2f38..d469b95 100644
--- a/clsql.asd
+++ b/clsql.asd
@@ -3,7 +3,7 @@
 ;;;; FILE IDENTIFICATION
 ;;;;
 ;;;; Name:     clsql.asd
-;;;; Purpose:  ASDF system definition for CLSQL
+;;;; Purpose:  ASDF System definition for CLSQL
 ;;;; Authors:  Marcus Pearce and Kevin M. Rosenberg
 ;;;; Created:  March 2004
 ;;;;
@@ -16,14 +16,15 @@
 (defpackage #:clsql-system (:use #:asdf #:cl))
 (in-package #:clsql-system)
 
-#+clisp
-(progn
-  (asdf:operate 'asdf:load-op 'cffi)
-  (asdf:operate 'asdf:load-op 'cffi-uffi-compat)
-  (asdf:defsystem uffi :depends-on (cffi-uffi-compat)))
+#+(and clisp (not :clsql-cffi))
+(asdf:operate 'asdf:load-op 'clsql-cffi)
 
 ;; need to load uffi for below perform :after method
 (eval-when (:compile-toplevel :load-toplevel :execute)
+  #+:clsql-cffi
+  (unless (find-package 'cffi-uffi-compat)
+    (asdf:operate 'asdf:load-op 'cffi-uffi-compat))
+  #-:clsql-cffi
   (unless (find-package 'uffi)
     (asdf:operate 'asdf:load-op 'uffi)))
 
@@ -34,9 +35,10 @@
     :licence "Lessor Lisp General Public License"
     :description "Common Lisp SQL Interface library"
     :long-description "A Common Lisp interface to SQL RDBMS based on
-the Xanalys CommonSQL interface for Lispworks. It depends on the
-low-level database interfaces as well as a functional and an object
+the Xanalys CommonSQL interface for Lispworks. It provides low-level
+database interfaces as well as a functional and an object
 oriented interface."
+    :version "6.4"
     :components
     ((:module sql
 	      :components
@@ -86,7 +88,8 @@ oriented interface."
 			:pathname ""
 			:components ((:file "generic-postgresql")
 				     (:file "generic-odbc")
-				     (:file "sequences"))
+				     (:file "sequences")
+				     (:file "command-object"))
 			:depends-on (functional))))))