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.
This commit is contained in:
parent
2251572062
commit
df57ae1639
|
@ -1560,7 +1560,9 @@ AM_CONDITIONAL([LINUX_ALPHA], [test "x$linux_alpha" = xyes])
|
|||
AM_CONDITIONAL([LNXACPI], [test "x$linux_acpi" = xyes])
|
||||
AM_CONDITIONAL([SOLARIS_USL_CONSOLE], [test "x$solaris_usl_console" = xyes])
|
||||
AM_CONDITIONAL([SOLARIS_ASM_INLINE], [test "x$solaris_asm_inline" = 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"
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue