X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests%2Fforeign-loader.lisp;h=cebbeaefaebe640e34dbef91b1078daa181f9e63;hb=6bd6231f953702ae8d2e949860ee30285d0f3f2a;hp=a4e924a97828755f86b15b1e92e7de5c392ee45f;hpb=7599e54026e90011250b3113f9f2276eec162a3c;p=uffi.git

diff --git a/tests/foreign-loader.lisp b/tests/foreign-loader.lisp
index a4e924a..cebbeae 100644
--- a/tests/foreign-loader.lisp
+++ b/tests/foreign-loader.lisp
@@ -7,7 +7,7 @@
 ;;;; Author:        Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: foreign-loader.lisp,v 1.6 2003/08/26 17:27:01 kevin Exp $
+;;;; $Id$
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -19,24 +19,25 @@
 (in-package uffi-tests)
 
 (unless (uffi:load-foreign-library
-	 #-(or macosx darwin)
 	 (uffi:find-foreign-library
+	  #-(or macosx darwin)
 	  "libz"
-	  '("/usr/local/lib/" "/usr/lib/" "/zlib/")
-	  :types '("so" "a"))
-	 #+(or macosx darwin)
-	 (uffi:find-foreign-library
-	  "z" (list (pathname-directory *load-pathname*)))
+	  #+(or macosx darwin)
+	  "z"
+	  (list (pathname-directory *load-pathname*)
+		"/usr/local/lib/" #+(or 64bit x86-64) "/usr/lib64/"
+		"/usr/lib/" "/zlib/"))
 	 :module "zlib" 
 	 :supporting-libraries '("c"))
   (warn "Unable to load zlib"))
   
 (unless (uffi:load-foreign-library 
-	 (uffi:find-foreign-library "uffi-c-test-lib" 
-				    (list
-				     (pathname-directory *load-truename*)
-				     "/usr/lib/uffi/"))
+	 (uffi:find-foreign-library
+	  '(#+(or 64bit x86-64) "uffi-c-test64" "uffi-c-test") 
+	  (list (pathname-directory *load-truename*)
+		"/usr/lib/uffi/"
+		"/home/kevin/debian/src/uffi/tests/"))
 	 :supporting-libraries '("c")
 	 :module "uffi_tests")
-  (warn "Unable to load uffi-c-test-lib library"))
+  (warn "Unable to load uffi-c-test library"))