From 7664dc9843c531deb4528b3d23466f8f8191a7e9 Mon Sep 17 00:00:00 2001 From: Dave Cooper Date: Mon, 15 Jan 2018 11:28:43 -0500 Subject: [PATCH] protect setup-cffi for allegro --- setup-cffi/source/setup.lisp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/setup-cffi/source/setup.lisp b/setup-cffi/source/setup.lisp index feb819b4..589e1e68 100644 --- a/setup-cffi/source/setup.lisp +++ b/setup-cffi/source/setup.lisp @@ -1,4 +1,4 @@ -(in-package :cffi) +(when (find-package :cffi) (in-package :cffi)) (defun %exe-path% () #+sbcl (make-pathname :name nil :type nil :defaults sb-ext:*core-pathname*) @@ -6,12 +6,13 @@ #+allegro (translate-logical-pathname "sys:") #+lispworks (make-pathname :name nil :type nil :defaults (first system:*line-arguments-list*))) -(pushnew (merge-pathnames (format nil "dlls/~a/" (if (member :32-bit-host *features*) "32" "64")) - (%exe-path%)) - cffi:*foreign-library-directories*) +(when (find-package :cffi) + (pushnew (merge-pathnames (format nil "dlls/~a/" (if (member :32-bit-host *features*) "32" "64")) + (%exe-path%)) + (symbol-value (read-from-string "cffi:*foreign-library-directories*"))) -(define-foreign-library libeay32 - (:windows "libeay32.dll")) + (define-foreign-library libeay32 + (:windows "libeay32.dll")) -(use-foreign-library libeay32) + (use-foreign-library libeay32)) -- GitLab