X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests%2Fforeign-loader.lisp;h=2053273ed39492e63e2a398ce0cd1644671ee6e3;hb=a3db800bfa385ae39d729ef0eb8f08a78ceaccdb;hp=c0548c1218b98bab89c8df00c61b8d72821aea90;hpb=80ca106516b23083e732b6e3e21547e890ca97a9;p=uffi.git

diff --git a/tests/foreign-loader.lisp b/tests/foreign-loader.lisp
index c0548c1..2053273 100644
--- a/tests/foreign-loader.lisp
+++ b/tests/foreign-loader.lisp
@@ -7,9 +7,7 @@
 ;;;; Author:        Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id$
-;;;;
-;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
+;;;; This file, part of UFFI, is Copyright (c) 2002-2010 by Kevin M. Rosenberg
 ;;;;
 ;;;; *************************************************************************
 
@@ -18,26 +16,32 @@
 
 (in-package uffi-tests)
 
+#+clisp (uffi:load-foreign-library "/usr/lib/libz.so" :module "z")
+#-clisp
 (unless (uffi:load-foreign-library
-	 (uffi:find-foreign-library
-	  #-(or macosx darwin)
-	  "libz"
-	  #+(or macosx darwin)
-	  "z"
-	  (list (pathname-directory *load-pathname*)
-		"/usr/local/lib/" #+64bit "/usr/lib64/" 
-		"/zlib/"))
-	 :module "zlib" 
-	 :supporting-libraries '("c"))
+         (uffi:find-foreign-library
+          #-(or macosx darwin)
+          "libz"
+          #+(or macosx darwin)
+          "z"
+          (list (pathname-directory *load-pathname*)
+                "/usr/local/lib/" #+(or 64bit x86-64) "/usr/lib64/"
+                "/usr/lib32/"
+                "/opt/local/lib/"
+                "/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" 
-	  (list (pathname-directory *load-truename*)
-		"/usr/lib/uffi/"
-		"/home/kevin/debian/src/uffi/tests/"))
-	 :supporting-libraries '("c")
-	 :module "uffi_tests")
+
+#+clisp (uffi:load-foreign-library "/home/kevin/debian/src/uffi/tests/uffi-c-test.so" :module "uffi_tests")
+#-clisp
+(unless (uffi:load-foreign-library
+         (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 library"))