diff -Naur ltib.orig/config/userspace/pkg_map ltib.new/config/userspace/pkg_map
--- ltib.orig/config/userspace/pkg_map	2009-07-17 12:46:18.000000000 -0300
+++ ltib.new/config/userspace/pkg_map	2009-08-21 14:19:24.000000000 -0300
@@ -148,11 +148,8 @@
 PKG_GLIB2                        = glib2
 PKG_DIRECTFB                     = DirectFB
 PKG_DIRECTFB_EXAMPLES            = DirectFB-examples
-PKG_CAIRO                        = cairo
 PKG_ATK                          = atk
-PKG_PANGO                        = pango
 PKG_ALSA_LIB                     = alsa-lib
-PKG_GTK2                         = gtk2
 PKG_SWIG                         = swig
 PKG_MICROWINDOWS                 = microwindows
 PKG_TSLIB                        = tslib
@@ -344,6 +341,9 @@
 PKG_LIBXRENDER                   = libXrender
 PKG_LIBXEXT                      = libXext
 PKG_XORG_SERVER                  = xorg-server
+PKG_CAIRO                        = cairo
+PKG_PANGO                        = pango
+PKG_GTK2                         = gtk2
 PKG_EET                          = eet
 PKG_EMBRYO                       = embryo
 PKG_EDB                          = edb
diff -Naur ltib.orig/dist/lfs-5.1/cairo/cairo.spec ltib.new/dist/lfs-5.1/cairo/cairo.spec
--- ltib.orig/dist/lfs-5.1/cairo/cairo.spec	2007-11-19 15:45:17.000000000 -0200
+++ ltib.new/dist/lfs-5.1/cairo/cairo.spec	2009-08-21 14:16:01.000000000 -0300
@@ -21,9 +21,15 @@
 
 %Build
 XTRA_OPTS="--disable-win32"
+
+if ! rpm --dbpath %{_dbpath} -q xorg-server &>/dev/null
+then
+        XTRA_OPTS='--disable-xlib';
+fi
+
 if [ -n "$PKG_DIRECTFB" ]
 then
-    XTRA_OPTS="$XTRA_OPTS --enable-directfb --disable-xlib"
+    XTRA_OPTS="$XTRA_OPTS --enable-directfb"
 fi
 ./configure --prefix=%{_prefix} --host=$CFGHOST --build=%{_build} $XTRA_OPTS
 make
diff -Naur ltib.orig/dist/lfs-5.1/gtk2/gtk2.spec ltib.new/dist/lfs-5.1/gtk2/gtk2.spec
--- ltib.orig/dist/lfs-5.1/gtk2/gtk2.spec	2008-12-05 14:32:14.000000000 -0200
+++ ltib.new/dist/lfs-5.1/gtk2/gtk2.spec	2009-08-21 14:16:01.000000000 -0300
@@ -23,8 +23,16 @@
 %patch2 -p1
 
 %Build
+if rpm --dbpath %{_dbpath} -q xorg-server &>/dev/null
+then
+	extra_opts='--with-x';
+else
+	extra_opts='--without-x --with-gdktarget=directfb';
+fi
+
 ./configure --prefix=%{_prefix} --host=$CFGHOST --build=%{_build} \
-            --with-gdktarget=directfb --without-x -C
+            $extra_opts -C
+
 perl -pi -e 's,^sys_lib_search_path_spec=.*,sys_lib_search_path_spec=,' libtool
 make
 
diff -Naur ltib.orig/dist/lfs-5.1/pango/pango.spec ltib.new/dist/lfs-5.1/pango/pango.spec
--- ltib.orig/dist/lfs-5.1/pango/pango.spec	2008-12-05 14:32:15.000000000 -0200
+++ ltib.new/dist/lfs-5.1/pango/pango.spec	2009-08-21 14:16:01.000000000 -0300
@@ -19,7 +19,14 @@
 %setup 
 
 %Build
-./configure --prefix=%{_prefix} --host=$CFGHOST --build=%{_build} --without-x
+if rpm --dbpath %{_dbpath} -q xorg-server &>/dev/null
+then
+        extra_opts='--with-x';
+else
+        extra_opts='--without-x';
+fi
+
+./configure --prefix=%{_prefix} --host=$CFGHOST --build=%{_build} $extra_opts
 make
 
 %Install