From: DRC <dcommander@users.sourceforge.net>
Date: Sat, 1 Oct 2011 18:22:06 +0000 (+0000)
Subject: Disable Composite extension by default in the legacy-friendly TigerVNC build.  Justif... 
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3a3cc7e10f777c3de7d28745079c3fc0b63183af;p=tigervnc.git

Disable Composite extension by default in the legacy-friendly TigerVNC build.  Justification:  Some older versions of Gnome do not work properly when Composite is enabled.  This is known to be a problem with RHEL 4 (Gnome 2.8), and it causes the legacy-friendly build to be unusable on that platform.  Newer Gnome versions, such as 2.16.0 (the version in RHEL 5), work properly with Composite enabled, but those versions don't support compositing anyhow, so it doesn't matter if we remove the extension.  Typically, platforms that are new enough to support compositing are also new enough to not require the legacy-friendly build of TigerVNC.  Further, Composite can be re-enabled by simply adding --enable-composite to the XORGCFGFLAGS env. variable prior to executing 'build-xorg build'.


git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/branches/1_1@4685 3789f03b-4d11-0410-bbf8-ca57d06f2519
---

diff --git a/unix/build-xorg b/unix/build-xorg
index ff32381b..da6d3814 100755
--- a/unix/build-xorg
+++ b/unix/build-xorg
@@ -188,7 +188,7 @@ build ()
     echo "*** Building xserver ***"
     pushd xorg/xserver
     autoreconf -fiv
-    XORGCFGFLAGS="--disable-xinerama --disable-xvfb --disable-xnest --disable-xorg --disable-dmx --disable-xwin --disable-xephyr --disable-kdrive --disable-config-dbus --disable-config-hal --disable-config-udev --with-sha1=libgcrypt SHA1_LIB=-lcrypto --disable-shared --enable-static ${XORGCFGFLAGS}"
+    XORGCFGFLAGS="--disable-composite --disable-xinerama --disable-xvfb --disable-xnest --disable-xorg --disable-dmx --disable-xwin --disable-xephyr --disable-kdrive --disable-config-dbus --disable-config-hal --disable-config-udev --with-sha1=libgcrypt SHA1_LIB=-lcrypto --disable-shared --enable-static ${XORGCFGFLAGS}"
     ./configure ${1+"$@"} --prefix=${PREFIX} ${XORGCFGFLAGS}
     if [ $? -ne 0 ]; then
 	echo "Failed to configure X server."