r9523: * clsql-mysql.asd, clsql-uffi.asd: Remove check and Common Lisp

        Controller invocation.

diff --git a/ChangeLog b/ChangeLog
index 6a7e1af7851ca23bb61471b236ccf0dca3eeb055..0aa79339ac9225c37b01a3d8dd7034d13cdfe1e4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,8 @@
        prepared statements. 
        * tests/test-internal.lisp: New file
        * sql/odbc-api.lisp: Update to using ODBC V3 protocol
+       * clsql-mysql.asd, clsql-uffi.asd: Remove check and Common Lisp
+       Controller invocation.
        
 27 May 2004 Kevin Rosenberg <kevin@rosenberg.net>
        * Version 2.11.3

diff --git a/clsql-mysql.asd b/clsql-mysql.asd
index fe661dc84972765f4951491e4272db5a09538259..cbcd9141d17532c262fdc7e0d3574f182751ea8c 100644 (file)
--- a/clsql-mysql.asd
+++ b/clsql-mysql.asd
@@ -20,8 +20,8 @@
 (in-package #:clsql-mysql-system)
 
 (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)))
 
 (defvar *library-file-dir* (append (pathname-directory *load-truename*)
                                   (list "db-mysql")))

diff --git a/clsql-uffi.asd b/clsql-uffi.asd
index 215e6bcada0116514e5ddf06f24bfe6af70482fb..e3aec75c16c1d076fc1bb40cba90aa01eab33911 100644 (file)
--- 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)