# HG changeset patch
# Parent 10356c5865aeb3a735432077e51ca7d02bb87714
diff -r 10356c5865ae -r 05535bc6b9a7 src/cffi-abcl.lisp
--- a/src/cffi-abcl.lisp	Tue May 29 15:35:09 2012 +0200
+++ b/src/cffi-abcl.lisp	Wed May 30 11:32:27 2012 +0200
@@ -35,8 +35,20 @@
 ;;;   (require 'abcl-contrib)
 ;;;   (require 'jna)
 
-(require 'abcl-contrib)
-(require 'jna)
+
+(handler-case 
+    (progn
+      (require :abcl-contrib)
+      (require :jna))
+  (t (condition) 
+    (progn
+      (warn "~&For Lisp implementation version: ~S~&Failed to load JNA via ABCL-CONTRIB on because: ~S~%Attempting to monkey patch via ABCL-ASDF."
+            (lisp-implementation-version)
+            condition)
+      (require :abcl-asdf)    
+      (java:add-to-classpath (abcl-asdf:resolve-dependencies "com.sun.jna" "jna" "3.0.9"))
+      (provide :jna))))
+
 
 ;;; This is a preliminary version that will have to be cleaned up,
 ;;; optimized, etc. Nevertheless, it passes all of the relevant CFFI