r10325: * sql/oodml.lisp: Use explicit database in fault-join-target-slot

[clsql.git] / uffi / clsql-uffi-loader.lisp

diff --git a/uffi/clsql-uffi-loader.lisp b/uffi/clsql-uffi-loader.lisp
index ab6702ab3c0e9c7089a6e0dddb61f80888f8964c..8b9efb7207601f7c490d0898d73e7dba28125945 100644 (file)
--- a/uffi/clsql-uffi-loader.lisp
+++ b/uffi/clsql-uffi-loader.lisp
@@ -2,31 +2,28 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Name:          clsql-uffi-loader.sql
-;;;; Purpose:       library loader using CLSQL UFFI helper library
-;;;; Programmers:   Kevin M. Rosenberg
-;;;; Date Started:  Mar 2002
+;;;; Name:     clsql-uffi-loader.sql
+;;;; Purpose:  Library loader using CLSQL UFFI helper library
+;;;; Author:   Kevin M. Rosenberg
+;;;; Created:  Mar 2002
 ;;;;
-;;;; $Id: clsql-uffi-loader.lisp,v 1.3 2002/10/17 22:13:20 kevin Exp $
+;;;; $Id$
 ;;;;
-;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
+;;;; This file, part of CLSQL, is Copyright (c) 2002-2004 by Kevin M. Rosenberg
 ;;;;
 ;;;; CLSQL users are granted the rights to distribute and use this software
 ;;;; as governed by the terms of the Lisp Lesser GNU Public License
 ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
-(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
-(in-package :clsql-uffi)
+(in-package #:clsql-uffi)
 
 (defvar *clsql-uffi-library-filename* 
   (uffi:find-foreign-library
-   "clsql-uffi"
-   `(,(make-pathname :directory (pathname-directory *load-truename*))
-     "/usr/lib/clsql/"
-     "/opt/lisp/clsql/uffi/"
-     "/home/kevin/debian/src/clsql/uffi/")
-   :drive-letters '("C" "D" "E" "F" "G")))
+   '(#+(or 64bit x86-64) "uffi64" "uffi")
+   `(,clsql-uffi-system::*library-file-dir*
+     "/usr/lib/clsql/")
+   :drive-letters '("C")))
 
 (defvar *clsql-uffi-supporting-libraries* '("c")
   "Used only by CMU. List of library flags needed to be passed to ld to
@@ -38,7 +35,7 @@ set to the right path before compiling or loading the system.")
 
 (defun load-uffi-foreign-library ()
   (unless (probe-file *clsql-uffi-library-filename*)
-    (error "Unable to find clsql-uffi.so"))
+    (error "Unable to find uffi.so"))
   
   (if (uffi:load-foreign-library *clsql-uffi-library-filename* 
                                 :module "clsql-uffi" 
@@ -49,5 +46,3 @@ set to the right path before compiling or loading the system.")
 
 (load-uffi-foreign-library)
 
-
-