Update of /project/lgtk/cvsroot/lgtk
In directory common-lisp.net:/tmp/cvs-serv1188
Modified Files:
lgtk.asd
Log Message:
Added support for multiple libraries, in particular glade.
Patch by Sean Champ.
Date: Thu Apr 28 20:10:32 2005
Author: mmommer
Index: lgtk/lgtk.asd
diff -u lgtk/lgtk.asd:1.10 lgtk/lgtk.asd:1.11
--- lgtk/lgtk.asd:1.10 Thu May 13 21:33:49 2004
+++ lgtk/lgtk.asd Thu Apr 28 20:10:32 2005
@@ -12,6 +12,11 @@
(defvar *ccompiler* "cc")
+
+;; list of library/module names to provide to pkgconfig
+(defparameter *pkgconfig-modules* '("gtk+-2.0" "libglade-2.0"))
+
+
;; Split a string at whitespace.
(defun splitatspc (str)
(labels ((whitespace-p (c)
@@ -32,10 +37,10 @@
(cdr buf))))
(defun pkg-config-lib-string ()
- #+sbcl (run-program "pkg-config" '("--libs" "gtk+-2.0")
+ #+sbcl (run-program "pkg-config" (list* "--libs" *pkgconfig-modules*)
:search t
:output :stream)
- #+cmu (ext:run-program "pkg-config" '("--libs" "gtk+-2.0")
+ #+cmu (ext:run-program "pkg-config" (list* "--libs" *pkgconfig-modules*)
:output :stream))
;; Get the list of libraries.
@@ -55,10 +60,10 @@
(defun pkg-config-cflags-string ()
- #+sbcl (run-program "pkg-config" '("--cflags" "gtk+-2.0")
+ #+sbcl (run-program "pkg-config" (list* "--cflags" *pkgconfig-modules*)
:search t
:output :stream)
- #+cmu (ext:run-program "pkg-config" '("--cflags" "gtk+-2.0")
+ #+cmu (ext:run-program "pkg-config" (list* "--cflags" *pkgconfig-modules*)
:output :stream))
(defun get-gtk-cflags ()