r10575: 09 Jun 2005 Kevin Rosenberg <kevin@rosenberg.net>

[clsql.git] / db-sqlite / sqlite-loader.lisp

diff --git a/db-sqlite/sqlite-loader.lisp b/db-sqlite/sqlite-loader.lisp
index 1cfcf21ffb675b52a20324907d5cb8be3bac6ff4..27bea2027750a8a60c4e71fb85f002f91ba29065 100644 (file)
--- a/db-sqlite/sqlite-loader.lisp
+++ b/db-sqlite/sqlite-loader.lisp
@@ -23,30 +23,20 @@
 to load the SQLite library succesfully.  If this differs at your site,
 set to the right path before compiling or loading the system.")
 
 to load the SQLite library succesfully.  If this differs at your site,
 set to the right path before compiling or loading the system.")
 

-(defvar *sqlite-library-loaded* #+clisp t
-                               #-clisp nil
-    "T if foreign library was able to be loaded successfully")
+(defvar *sqlite-library-loaded* nil
+  "T if foreign library was able to be loaded successfully")

 
 (defmethod database-type-library-loaded ((database-type (eql :sqlite)))
   "T if foreign library was able to be loaded successfully. "
   *sqlite-library-loaded*)
 
 (defmethod database-type-load-foreign ((database-type (eql :sqlite)))
 
 (defmethod database-type-library-loaded ((database-type (eql :sqlite)))
   "T if foreign library was able to be loaded successfully. "
   *sqlite-library-loaded*)
 
 (defmethod database-type-load-foreign ((database-type (eql :sqlite)))

-  #+clisp
-   t
-  #-clisp
-  (let ((libpath (uffi:find-foreign-library
-                 "libsqlite"
-                 '("/usr/lib/" "/usr/local/lib/")
-                 :drive-letters '("C" "D" "E"))))
-    (if (uffi:load-foreign-library libpath
-                                  :module "sqlite"
-                                  :supporting-libraries 
-                                  *sqlite-supporting-libraries*)
-       (setq *sqlite-library-loaded* t)
-       (warn "Can't load SQLite library ~A" libpath))))
-
-(clsql-base:database-type-load-foreign :sqlite)
+  (clsql-uffi:find-and-load-foreign-library '("libsqlite" "sqlite")
+                                            :module "sqlite"
+                                            :supporting-libraries *sqlite-supporting-libraries*)
+  (setq *sqlite-library-loaded* t))
+
+(clsql-sys:database-type-load-foreign :sqlite)