xserver: Branch 'server-1.4-branch'

[Daniel Stone]

 configure.ac                          |    4 +++-
 hw/xfree86/dixmods/extmod/Makefile.am |   14 ++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

New commits:
commit bd779f8cde1c71a0db8470b8c993504da7c1104e
Author: Daniel Stone <daniel at fooishbar.org>
Date:   Sun Oct 28 15:46:26 2007 +0200

    configure.ac/XFree86: Only build XF86Misc and XF86VidMode when appropriate
    
    Don't build XF86Misc or XF86Vidmode in hw/xfree86/dixmod when it's been
    explicitly disabled in configure, or we don't have the proto modules
    installed.
    
    (cherry picked from commit df57ae1639ba4f1719883c5bf868394e4748a022)

diff --git a/configure.ac b/configure.ac
index 62fdd78..d9351ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1590,7 +1590,9 @@ AM_CONDITIONAL([SOLARIS_USL_CONSOLE], [test "x$solaris_usl_console" = xyes])
 AM_CONDITIONAL([SOLARIS_ASM_INLINE], [test "x$solaris_asm_inline" = xyes])
 AM_CONDITIONAL([BUILD_DARWIN],[test "X$build_darwin" = Xyes])
 AM_CONDITIONAL([XQUARTZ],[test "X$XQUARTZ" = Xyes])
-AM_CONDITIONAL(DGA, [test "x$DGA" = xyes])
+AM_CONDITIONAL([DGA], [test "x$DGA" = xyes])
+AM_CONDITIONAL([XF86MISC], [test "x$XF86MISC" = xyes])
+AM_CONDITIONAL([XF86VIDMODE], [test "x$XF86VIDMODE" = xyes])
 
 dnl legacy fb support
 test "x$MFB" = xauto && MFB="$XORG"
diff --git a/hw/xfree86/dixmods/extmod/Makefile.am b/hw/xfree86/dixmods/extmod/Makefile.am
index 9f6c408..f90e144 100644
--- a/hw/xfree86/dixmods/extmod/Makefile.am
+++ b/hw/xfree86/dixmods/extmod/Makefile.am
@@ -11,6 +11,14 @@ if XV
 XV_SRCS = xvmod.c xvmodproc.h
 endif
 
+if XF86MISC
+XF86MISC_SRCS = xf86misc.c xf86miscproc.h
+endif
+
+if XF86VIDMODE
+XF86VMODE_SRCS = xf86vmode.c vidmodeproc.h
+endif
+
 AM_CFLAGS = @DIX_CFLAGS@ @XORG_CFLAGS@
 INCLUDES = @XORG_INCS@ \
            -I$(top_srcdir)/afb \
@@ -24,9 +32,7 @@ libextmod_la_LDFLAGS = -avoid-version
 libextmod_la_SOURCES = modinit.c \
                        modinit.h \
                        $(DGA_SRCS) \
-                       xf86misc.c \
-                       xf86miscproc.h \
-                       xf86vmode.c \
-                       vidmodeproc.h \
+                       $(XF86MISC_SRCS) \
+                       $(XF86VMODE_SRCS) \
                        $(XV_SRCS)
 libextmod_la_LIBADD = $(top_builddir)/Xext/libXextmodule.la