[lgtk-cvs] CVS update: lgtk/lgtk.asd

[Mario Mommer]

Update of /project/lgtk/cvsroot/lgtk
In directory common-lisp.net:/tmp/cvs-serv13531

Modified Files:
      Tag: sbcl-port
	lgtk.asd 
Log Message:
Applied patch by  Damien Diederen <diederen (at) swing (dot) be>.
It should run on sbcl.

Date: Fri Dec  5 11:55:07 2003
Author: mmommer

Index: lgtk/lgtk.asd
diff -u lgtk/lgtk.asd:1.7 lgtk/lgtk.asd:1.7.4.1
--- lgtk/lgtk.asd:1.7	Sun Nov  9 12:32:45 2003
+++ lgtk/lgtk.asd	Fri Dec  5 11:55:07 2003
@@ -6,7 +6,7 @@
 ;; advertising clause"). See the file COPYING for details.
 
 (defpackage #:lgtk-asd
-  (:use :cl :asdf))
+  (:use :cl :asdf #+cmu :ext #+sbcl :sb-ext #+sbcl :sb-alien))
 
 (in-package :lgtk-asd)
 
@@ -33,12 +33,13 @@
 
 ;; Get the list of libraries.
 (defun get-gtk-libs-list ()
-  (let ((prc (ext:run-program "pkg-config" '("--libs" "gtk+-2.0")
+  (let ((prc (run-program "pkg-config" '("--libs" "gtk+-2.0")
+			  :search t
 			  :output :stream)))
     (if (not prc)
 	(error "Could not run #\"pckg-config!")
-      (let ((str (ext:process-output prc))
-	    (ecode (ext:process-exit-code prc)))
+      (let ((str (process-output prc))
+	    (ecode (process-exit-code prc)))
 	(if (not (eql ecode 0))
 	    (error "Could not find gtk+-2.0")
 	  (remove-if ;; Remove options which do not specify a lib
@@ -48,12 +49,13 @@
 	   (splitatspc (read-line str))))))))
 
 (defun get-gtk-cflags-list ()
-  (let ((prc (ext:run-program "pkg-config" '("--cflags" "gtk+-2.0")
+  (let ((prc (run-program "pkg-config" '("--cflags" "gtk+-2.0")
+			  :search t
 			  :output :stream)))
     (if (not prc)
 	(error "Could not run #\"pckg-config!")
-      (let ((str (ext:process-output prc))
-	    (ecode (ext:process-exit-code prc)))
+      (let ((str (process-output prc))
+	    (ecode (process-exit-code prc)))
 	(if (not (eql ecode 0))
 	    (error "Could not find gtk+-2.0")
 	  (read-line str))))))
@@ -78,8 +80,8 @@
 
 (defmethod perform ((o load-op) (c gtk-libs-handle))
   (setf *source-dir* (pathname-directory (component-pathname c)))
-  (ext:load-foreign (namestring (car (output-files o c)))
-		    :libraries *gtklibs*))
+  (load-foreign (namestring (car (output-files o c)))
+		:libraries *gtklibs*))
 
 (defsystem lgtk
   :name "lgtk"