[PATCH modular] build.sh: remove USE_XCB conditional

Gaetan Nadon memsize at videotron.ca
Mon Jan 25 09:24:51 PST 2010


The configure --with-xcb option does not exist on xserver.

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 build.sh |   19 ++++---------------
 1 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/build.sh b/build.sh
index eae96f5..0cc6157 100755
--- a/build.sh
+++ b/build.sh
@@ -190,10 +190,6 @@ build() {
     # Special configure flags for certain modules
     MOD_SPECIFIC=
 
-    if test "$1" = "lib" && test "$2" = "libX11" && test x"$USE_XCB" = xNO; then
-	MOD_SPECIFIC="--with-xcb=no"
-    fi
-
     LIB_FLAGS=
     if test x$LIBDIR != x ; then
         LIB_FLAGS="--libdir=${PREFIX}/${LIBDIR}"
@@ -266,9 +262,7 @@ build_proto() {
     build proto xf86driproto
     build proto xf86vidmodeproto
     build proto xineramaproto
-    if test x"$USE_XCB" != xNO ; then
-	build xcb proto
-    fi
+    build xcb proto
 }
 
 # bitmaps is needed for building apps, so has to be done separately first
@@ -301,11 +295,9 @@ build_lib() {
     build lib libxtrans
     build lib libXau
     build lib libXdmcp
-    if test x"$USE_XCB" != xNO ; then
-        build xcb pthread-stubs
-	build xcb libxcb
-        build xcb util
-    fi
+    build xcb pthread-stubs
+    build xcb libxcb
+    build xcb util
     build lib libX11
     build lib libXext
     case $HOST_OS in
@@ -442,9 +434,6 @@ build_app() {
     build app xwd
     build app xwininfo
     build app xwud
-#    if test x"$USE_XCB" != xNO ; then
-#	build xcb demo
-#    fi
 }
 
 build_mesa() {
-- 
1.6.0.4



More information about the xorg-devel mailing list