New commits:
commit eecd9b9ae6b4c92552c778393c6b23b3e0c3e7ee
Author: Mark Bainter <mbainter AT sourcemage.org>
Commit: Mark Bainter <mbainter AT sourcemage.org>
gnome2-libs/pango: Rewrite support for building without X11 to support
SUB_DEPENDS
diff --git a/gnome2-libs/pango/CONFIGURE b/gnome2-libs/pango/CONFIGURE
index 97a1867..f626175 100755
--- a/gnome2-libs/pango/CONFIGURE
+++ b/gnome2-libs/pango/CONFIGURE
@@ -1,4 +1,2 @@
config_query PANGO_ARABIC "Build arabic dynamic modules (can \
cause problems with webkit browsers)?" y
-
-config_query WITH_X11 "Build with X11 and Xft support?" y
diff --git a/gnome2-libs/pango/DEPENDS b/gnome2-libs/pango/DEPENDS
index 7a6f3df..60b66b5 100755
--- a/gnome2-libs/pango/DEPENDS
+++ b/gnome2-libs/pango/DEPENDS
@@ -3,8 +3,12 @@ depends cairo &&
depends fontconfig &&
depends glib2 &&
-if [[ "$WITH_X11" == y ]]; then
- depends libx11 &&
+optional_depends libx11 \
+ "--with-x11" \
+ "--without-x11" \
+ "for XFT and X11 support" &&
+
+if is_depends_enabled $SPELL libx11; then
depends libxau &&
depends libxft &&
depends libxdmcp &&
@@ -12,8 +16,6 @@ if [[ "$WITH_X11" == y ]]; then
if spell_ok cairo && [[ $(installed_version cairo) < 1.8 ]]; then
force_depends cairo
fi
-else
- depends cairo
fi &&
optional_depends gtk-doc \
diff --git a/gnome2-libs/pango/HISTORY b/gnome2-libs/pango/HISTORY
index 0b8a2e7..91c6162 100644
--- a/gnome2-libs/pango/HISTORY
+++ b/gnome2-libs/pango/HISTORY
@@ -1,6 +1,11 @@
2010-06-23 Mark Bainter <mbainter AT sourcemage.org>
+ * PRE_SUB_DEPENDS,SUB_DEPENDS: Add subdepends support for x11
+ * CONFIGURE: Remove x11 query in favor of depends entry
+ * DEPENDS: Rewrite support for building without x11
+
+2010-06-23 Mark Bainter <mbainter AT sourcemage.org>
* CONFIGURE: Add option for building without x11
- * DEPENDS: Add support for building without x11
+ * DEPENDS: Add support for building without x11