diff -Naur ltib.orig/dist/lfs-5.1/gtk2/gtk2.spec ltib.new/dist/lfs-5.1/gtk2/gtk2.spec
--- dist/lfs-5.1/gtk2/gtk2.spec	2008-12-05 14:32:14.000000000 -0200
+++ dist/lfs-5.1/gtk2/gtk2.spec	2009-08-17 09:47:28.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';
+fi
+
 ./configure --prefix=%{_prefix} --host=$CFGHOST --build=%{_build} \
-            --with-gdktarget=directfb --without-x -C
+            --with-gdktarget=directfb $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
--- dist/lfs-5.1/pango/pango.spec	2008-12-05 14:32:15.000000000 -0200
+++ dist/lfs-5.1/pango/pango.spec	2009-08-17 09:48:10.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