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

[Mario Mommer]

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

Modified Files:
      Tag: sbcl-port
	lgtk.asd 
Log Message:
Fixed a bug which prevented it from loading in cmucl.

Date: Fri Dec  5 12:55:51 2003
Author: mmommer

Index: lgtk/lgtk.asd
diff -u lgtk/lgtk.asd:1.7.4.1 lgtk/lgtk.asd:1.7.4.2
--- lgtk/lgtk.asd:1.7.4.1	Fri Dec  5 11:55:07 2003
+++ lgtk/lgtk.asd	Fri Dec  5 12:55:51 2003
@@ -31,13 +31,18 @@
 
       (cdr buf))))
 
+(defun pkg-config-lib-string ()
+  #+sbcl (run-program "pkg-config" '("--libs" "gtk+-2.0")
+		      :search t
+		      :output :stream)
+  #+cmu (ext:run-program "pkg-config" '("--libs" "gtk+-2.0")
+			  :output :stream))
+
 ;; Get the list of libraries.
 (defun get-gtk-libs-list ()
-  (let ((prc (run-program "pkg-config" '("--libs" "gtk+-2.0")
-			  :search t
-			  :output :stream)))
+  (let ((prc (pkg-config-lib-string)))
     (if (not prc)
-	(error "Could not run #\"pckg-config!")
+	(error "Could not run #\"pkg-config!")
       (let ((str (process-output prc))
 	    (ecode (process-exit-code prc)))
 	(if (not (eql ecode 0))
@@ -48,10 +53,16 @@
 						   ;; insenitive.
 	   (splitatspc (read-line str))))))))
 
+
+(defun pkg-config-cflags-string ()
+  #+sbcl (run-program "pkg-config" '("--cflags" "gtk+-2.0")
+		      :search t
+		      :output :stream)
+  #+cmu (ext:run-program "pkg-config" '("--cflags" "gtk+-2.0")
+			  :output :stream))
+
 (defun get-gtk-cflags-list ()
-  (let ((prc (run-program "pkg-config" '("--cflags" "gtk+-2.0")
-			  :search t
-			  :output :stream)))
+  (let ((prc (pkg-config-cflags-string)))
     (if (not prc)
 	(error "Could not run #\"pckg-config!")
       (let ((str (process-output prc))