xserver: Branch 'master'

[Carl Worth]

 configure.ac |   16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

New commits:
commit 1888d7d3e3ae81b5cb23e3a0852317362c8e215a
Author: Carl Worth <cworth at cworth.org>
Date:   Fri Sep 18 10:39:19 2009 -0700

    configure: Fix broken quoting for initialization of REQUIRED_MODULES
    
    A recent change switched to C-style automatic string concatenation,
    (presumably for better readability and maintainability), but this
    doesn't actually work for the shell. So we revert to the previously
    working initialization.
    
    This commit reverts one hunk of c947605eda082fbca0821efc0cc14fec8f958fd0

diff --git a/configure.ac b/configure.ac
index 3e02308..ede590f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -735,21 +735,7 @@ WINDOWSWMPROTO="windowswmproto"
 APPLEWMPROTO="applewmproto >= 1.4"
 
 dnl Core modules for most extensions, et al.
-REQUIRED_MODULES="randrproto >= 1.2.99.3 "    \
-                 "renderproto >= 0.11 "       \
-                 "damageproto >= 1.1 "        \
-                 "xcmiscproto >= 1.2.0 "      \
-                 "xextproto >= 7.0.99.3 "     \
-                 "xproto >= 7.0.13 "          \
-                 "xtrans >= 1.2.2 "           \
-                 "bigreqsproto >= 1.1.0 "     \
-                 "resourceproto "               \
-                 "fontsproto "                  \
-                 "inputproto >= 1.9.99.902 "  \
-                 "kbproto >= 1.0.3 "          \
-                 "fixesproto >= 4.0"
-
-
+REQUIRED_MODULES="[randrproto >= 1.2.99.3] [renderproto >= 0.11] [fixesproto >= 4.0] [damageproto >= 1.1] [xcmiscproto >= 1.2.0] [xextproto >= 7.0.99.3] [xproto >= 7.0.13] [xtrans >= 1.2.2] [bigreqsproto >= 1.1.0] resourceproto fontsproto [inputproto >= 1.9.99.902] [kbproto >= 1.0.3]"
 REQUIRED_LIBS="xfont xau [pixman-1 >= 0.15.20]"
 
 dnl HAVE_DBUS is true if we actually have the D-Bus library, whereas