X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=db-sqlite%2Fsqlite-loader.lisp;h=e7d4f72e32fe549590003ad39caa68b504b98ac7;hp=71e33854da3dc5aa0d664241dbf710a9805a2084;hb=e567409d9fff3f7231c2a0bb69b345e19de2b246;hpb=b746611f6d622273f1563d9d0f65b59b58714694

diff --git a/db-sqlite/sqlite-loader.lisp b/db-sqlite/sqlite-loader.lisp
index 71e3385..e7d4f72 100644
--- a/db-sqlite/sqlite-loader.lisp
+++ b/db-sqlite/sqlite-loader.lisp
@@ -23,31 +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.")
 
-(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)))
-  #+clisp
-   t
-  #-clisp
-  (let ((libpath (uffi:find-foreign-library
-		  "libsqlite"
-		  '(#+64bit "/usr/lib64/"
-		    "/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)
+
+
+