X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=db-sqlite3%2Fsqlite3-loader.lisp;h=90264ea62aeb531746251c7d72378b5fa7f8692d;hp=9efaf1f37f80c1708748df8b3f3f06a3c8785724;hb=d2d49ab13c98bc7a1819a0fd3968268a5567bdc3;hpb=f7ffd9617ac7b70d330add3ad409128a9dec266f

diff --git a/db-sqlite3/sqlite3-loader.lisp b/db-sqlite3/sqlite3-loader.lisp
index 9efaf1f..90264ea 100644
--- a/db-sqlite3/sqlite3-loader.lisp
+++ b/db-sqlite3/sqlite3-loader.lisp
@@ -7,8 +7,6 @@
 ;;;; Programmer:    Aurelio Bignoli
 ;;;; Date Started:  Oct 2004
 ;;;;
-;;;; $Id$
-;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2004 by Aurelio Bignoli
 ;;;;
 ;;;; CLSQL users are granted the rights to distribute and use this software
@@ -31,16 +29,9 @@ set to the right path before compiling or loading the system.")
   *sqlite3-library-loaded*)
 
 (defmethod database-type-load-foreign ((database-type (eql :sqlite3)))
-  (let ((libpath (uffi:find-foreign-library
-		  '("libsqlite3" "sqlite3")
-		  '(#+64bit "/usr/lib64/"
-		    "/usr/lib/" "/usr/local/lib/" "/bin/")
-		  :drive-letters '("C" "D" "E"))))
-    (if (uffi:load-foreign-library libpath
-				   :module "sqlite3"
-				   :supporting-libraries 
-				   *sqlite3-supporting-libraries*)
-	(setq *sqlite3-library-loaded* t)
-	(warn "Can't load Sqlite3 library ~A" libpath))))
+  (clsql-uffi:find-and-load-foreign-library '("libsqlite3" "sqlite3")
+                                            :module "sqlite3"
+                                            :supporting-libraries *sqlite3-supporting-libraries*)
+  (setq *sqlite3-library-loaded* t))
 
 (clsql-sys:database-type-load-foreign :sqlite3)