frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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:
Daniel Stone 2007-10-28 15:46:26 +02:00
parent 2251572062
commit df57ae1639
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -1560,7 +1560,9 @@ AM_CONDITIONAL([LINUX_ALPHA], [test "x$linux_alpha" = xyes])
AM_CONDITIONAL([LNXACPI], [test "x$linux_acpi" = xyes]) AM_CONDITIONAL([LNXACPI], [test "x$linux_acpi" = xyes])
AM_CONDITIONAL([SOLARIS_USL_CONSOLE], [test "x$solaris_usl_console" = 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([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 dnl legacy fb support
test "x$MFB" = xauto && MFB="$XORG" test "x$MFB" = xauto && MFB="$XORG"

14
hw/xfree86/dixmods/extmod/Makefile.am
View File

@ -11,6 +11,14 @@ if XV
XV_SRCS = xvmod.c xvmodproc.h XV_SRCS = xvmod.c xvmodproc.h
endif 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@ AM_CFLAGS = @DIX_CFLAGS@ @XORG_CFLAGS@
INCLUDES = @XORG_INCS@ \ INCLUDES = @XORG_INCS@ \
-I$(top_srcdir)/afb \ -I$(top_srcdir)/afb \
@ -24,9 +32,7 @@ libextmod_la_LDFLAGS = -avoid-version
libextmod_la_SOURCES = modinit.c \ libextmod_la_SOURCES = modinit.c \
modinit.h \ modinit.h \
$(DGA_SRCS) \ $(DGA_SRCS) \
xf86misc.c \ $(XF86MISC_SRCS) \
xf86miscproc.h \ $(XF86VMODE_SRCS) \
xf86vmode.c \
vidmodeproc.h \
$(XV_SRCS) $(XV_SRCS)
libextmod_la_LIBADD = $(top_builddir)/Xext/libXextmodule.la libextmod_la_LIBADD = $(top_builddir)/Xext/libXextmodule.la