Porting to CLISP

diff --git a/tools/config.lisp b/tools/config.lisp
index ffe8cfaf9d5b6e75623397781ae2d3f2834c7c8a..acf99438bbd6ad946ded34b5397cfc73327085c1 100644 (file)
--- a/tools/config.lisp
+++ b/tools/config.lisp
@@ -42,6 +42,7 @@ (defun read-string (&optional (stream *standard-input*)
      ((error 'end-of-file :stream stream)))))
 
 
      ((error 'end-of-file :stream stream)))))
 
 

+#+(or sbcl cmu)

 (defun run-pkg-config (package error &rest options)
   (let ((process
         (run-program
 (defun run-pkg-config (package error &rest options)
   (let ((process
         (run-program


@@ -59,6 +60,12 @@ (defun run-pkg-config (package error &rest options)
        (process-close process)
        (values output exit-code)))))
 
        (process-close process)
        (values output exit-code)))))
 

+#+clisp
+;; I haven't figured out how to do error checking with CLISP's run-program
+(defun run-pkg-config (package error &rest options)
+  (declare (ignore error))
+  (let ((stream (ext:run-program *pkg-config* :arguments (cons package options)  :output :stream)))
+    (read-lines stream)))

 
 (defun pkg-cflags (package)
   (split-string (first (run-pkg-config package t "--cflags"))))
 
 (defun pkg-cflags (package)
   (split-string (first (run-pkg-config package t "--cflags"))))