X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=db-sqlite%2Fsqlite-loader.lisp;h=ac77fafa4946e282aa53206895c3d2a2c550fa21;hb=c7cbd01b259a1846a5e172d69c956b836b14febb;hp=59baaee3822d4cfe8d81b0a0dcb477775e1c27ab;hpb=a9f4dd155f9802d1444ab03339879232c6337f57;p=clsql.git

diff --git a/db-sqlite/sqlite-loader.lisp b/db-sqlite/sqlite-loader.lisp
index 59baaee..ac77faf 100644
--- a/db-sqlite/sqlite-loader.lisp
+++ b/db-sqlite/sqlite-loader.lisp
@@ -7,8 +7,6 @@
 ;;;; Programmer:    Aurelio Bignoli
 ;;;; Date Started:  Nov 2003
 ;;;;
-;;;; $Id$
-;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2003 by Aurelio Bignoli
 ;;;;
 ;;;; CLSQL users are granted the rights to distribute and use this software
@@ -31,19 +29,12 @@ set to the right path before compiling or loading the system.")
   *sqlite-library-loaded*)
 
 (defmethod database-type-load-foreign ((database-type (eql :sqlite)))
-  (let ((libpath (uffi:find-foreign-library
-		  '("libsqlite" "sqlite")
-		  '(#+64bit "/usr/lib64/"
-		    "/usr/lib/" "/usr/local/lib/" "/bin/")
-		  :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-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)
 
 
-    
+