From 33cee578d5ee1cf4cdaac9ac321d2da52a1d6842 Mon Sep 17 00:00:00 2001
Message-Id: <33cee578d5ee1cf4cdaac9ac321d2da52a1d6842.1714140149.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Tue, 25 Apr 2006 22:16:22 +0000
Subject: [PATCH] Added gffi to the list of required modules
Organization: Straylight/Edgeware

From: espen <espen>

---
 atk/atk.asd     |  4 ++--
 cairo/cairo.asd |  4 ++--
 gdk/gdk.asd     | 10 ++--------
 pango/pango.asd |  4 ++--
 rsvg/rsvg.asd   |  4 ++--
 5 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/atk/atk.asd b/atk/atk.asd
index e46949b..9b03b9c 100644
--- a/atk/atk.asd
+++ b/atk/atk.asd
@@ -6,11 +6,11 @@
 
 (in-package "ATK-SYSTEM")
 
-(pkg-exists-p "atk" :atleast-version "1.6.0")
+(pkg-exists-p "atk" :atleast-version "1.6.0" :error t)
 
 
 (defsystem atk
-    :depends-on (glib gdk)
+    :depends-on (gffi glib gdk)
     :components ((:library "libatk-1.0"
 			   :libdir #.(pkg-variable "atk" "libdir"))
 		 (:file "defpackage")
diff --git a/cairo/cairo.asd b/cairo/cairo.asd
index d7bada9..4f015aa 100644
--- a/cairo/cairo.asd
+++ b/cairo/cairo.asd
@@ -6,11 +6,11 @@
 
 (in-package "CAIRO-SYSTEM")
 
-(pkg-exists-p "cairo" :atleast-version "1.0.2")
+(pkg-exists-p "cairo" :atleast-version "1.0.2" :error t)
 
 
 (defsystem cairo
-    :depends-on (glib)
+    :depends-on (gffi glib)
     :components ((:library "libcairo" 
 		  :libdir #.(pkg-variable "cairo" "libdir"))
 		 (:file "defpackage")
diff --git a/gdk/gdk.asd b/gdk/gdk.asd
index 6188254..5f04e4e 100644
--- a/gdk/gdk.asd
+++ b/gdk/gdk.asd
@@ -5,16 +5,10 @@
 
 (in-package "GDK-SYSTEM")
 
-(pkg-exists-p "gtk+-2.0" :atleast-version "2.4.0")
-
-(when (string>= (pkg-version "gtk+-2.0") "2.6.0")
-  (pushnew :gtk2.6 *features*))
-
-(when (string>= (pkg-version "gtk+-2.0") "2.8.0")
-  (pushnew :gtk2.8 *features*))
+(pkg-exists-p "gtk+-2.0" :atleast-version "2.4.0" :error t)
 
 (defsystem gdk
-    :depends-on (glib pango #+gtk2.8 cairo)
+    :depends-on (gffi glib pango #?(pkg-exists-p "gtk+-2.0" :atleast-version "2.8.0") cairo)
     :components ((:file "defpackage")
 		 (:library "libgdk_pixbuf-2.0" 
 			   :libdir #.(pkg-variable "gtk+-2.0" "libdir"))
diff --git a/pango/pango.asd b/pango/pango.asd
index b5b9cb5..86454fb 100644
--- a/pango/pango.asd
+++ b/pango/pango.asd
@@ -6,11 +6,11 @@
 
 (in-package "PANGO-SYSTEM")
 
-(pkg-exists-p "pango" :atleast-version "1.4.0")
+(pkg-exists-p "pango" :atleast-version "1.4.0" :error t)
 
 
 (defsystem pango
-    :depends-on (glib)
+    :depends-on (gffi glib)
     :components ((:library "libpango-1.0" :libdir #.(pkg-variable "pango" "libdir"))
 		 (:library "libpangoxft-1.0" :libdir #.(pkg-variable "pango" "libdir"))
 		 (:library "libpangoft2-1.0" :libdir #.(pkg-variable "pango" "libdir"))
diff --git a/rsvg/rsvg.asd b/rsvg/rsvg.asd
index b08b28c..6547619 100644
--- a/rsvg/rsvg.asd
+++ b/rsvg/rsvg.asd
@@ -6,11 +6,11 @@
 
 (in-package "RSVG-SYSTEM")
 
-(pkg-exists-p "librsvg-2.0" :atleast-version "2.13.93")
+(pkg-exists-p "librsvg-2.0" :atleast-version "2.13.93" :error t)
 
 
 (defsystem rsvg
-    :depends-on (glib gdk cairo)
+    :depends-on (gffi glib gdk cairo)
     :components ((:library "librsvg-2" 
 		  :libdir #.(pkg-variable "librsvg-2.0" "libdir"))
 		 (:file "defpackage")
-- 
[mdw]