xserver: Branch 'master'
Eamon Walsh
ewalsh at kemper.freedesktop.org
Wed Feb 28 00:15:58 EET 2007
configure.ac | 17 ++++++++++++++---
hw/xfree86/Makefile.am | 12 ++++++++++--
hw/xfree86/dixmods/Makefile.am | 19 +++++++++++++++----
3 files changed, 39 insertions(+), 9 deletions(-)
New commits:
diff-tree c16343ac2ca18391b21022b2edd02ad9f413d2b3 (from 5680efc0d2baf0a9451e82e490e3690fc23dda0f)
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Tue Feb 27 14:14:47 2007 -0500
Make mfb, cfb, and afb support configurable at build-time.
diff --git a/configure.ac b/configure.ac
index 3260855..9cefc2a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -540,6 +540,10 @@ AC_ARG_ENABLE(xprint, AS_HELP_ST
AC_ARG_ENABLE(xgl, AS_HELP_STRING([--enable-xgl], [Build Xgl server (default: no)]), [XGL=$enableval], [XGL=no])
AC_ARG_ENABLE(xglx, AS_HELP_STRING([--enable-xglx], [Build Xglx xgl module (default: no)]), [XGLX=$enableval], [XGLX=no])
AC_ARG_ENABLE(xegl, AS_HELP_STRING([--enable-xegl], [Build Xegl xgl module (default: no)]), [XEGL=$enableval], [XEGL=no])
+dnl legacy fb support
+AC_ARG_ENABLE(mfb, AS_HELP_STRING([--enable-mfb], [Build legacy mono framebuffer support (default: enabled)]), [MFB=$enableval], [MFB=$XORG])
+AC_ARG_ENABLE(cfb, AS_HELP_STRING([--enable-cfb], [Build legacy color framebuffer support (default: enabled)]), [CFB=$enableval], [CFB=$XORG])
+AC_ARG_ENABLE(afb, AS_HELP_STRING([--enable-afb], [Build legacy advanced framebuffer support (default: enabled)]), [AFB=$enableval], [AFB=$XORG])
dnl kdrive and its subsystems
AC_ARG_ENABLE(kdrive, AS_HELP_STRING([--enable-kdrive], [Build kdrive servers (default: no)]), [KDRIVE=$enableval], [KDRIVE=no])
AC_ARG_ENABLE(xephyr, AS_HELP_STRING([--enable-xephyr], [Build the kdrive Xephyr server (default: auto)]), [XEPHYR=$enableval], [XEPHYR=auto])
@@ -1561,13 +1565,20 @@ AM_CONDITIONAL([LINUX_ALPHA], [test "x$l
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(MFB, [test "x$XORG" = xyes])
-AM_CONDITIONAL(CFB, [test "x$XORG" = xyes])
-AM_CONDITIONAL(AFB, [test "x$XORG" = xyes])
AM_CONDITIONAL([BUILD_DARWIN],[test "X$build_darwin" = Xyes])
AM_CONDITIONAL([XQUARTZ],[test "X$XQUARTZ" = Xyes])
AM_CONDITIONAL(DGA, [test "x$DGA" = xyes])
+dnl legacy fb support
+AM_CONDITIONAL(MFB, [test "x$MFB" = xyes])
+AM_CONDITIONAL(CFB, [test "x$CFB" = xyes])
+AM_CONDITIONAL(AFB, [test "x$AFB" = xyes])
+if test "x$MFB" = xyes -o "x$CFB" = xyes -o "x$AFB" = xyes; then
+ if test "x$XORG" != xyes; then
+ AC_MSG_ERROR([legacy fb support requires the Xorg server])
+ fi
+fi
+
dnl Xprint DDX
AC_MSG_CHECKING([whether to build Xprint DDX])
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index 1a286d6..b669063 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -8,11 +8,19 @@ if XF86UTILS
XF86UTILS_SUBDIR = utils
endif
+if MFB
+MFB_SUBDIR = xf1bpp xf4bpp
+endif
+
+if CFB
+CFB_SUBDIR = xf8_16bpp xf8_32bpp
+endif
+
DOC_SUBDIR = doc
SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support parser rac \
- ramdac shadowfb vbe vgahw xaa xf1bpp xf4bpp xf8_16bpp \
- xf8_32bpp loader scanpci dixmods exa modes \
+ ramdac shadowfb vbe vgahw xaa $(MFB_SUBDIR) $(CFB_SUBDIR) \
+ loader scanpci dixmods exa modes \
$(DRI_SUBDIR) $(XF86UTILS_SUBDIR) $(DOC_SUBDIR)
DIST_SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support \
diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am
index c34ddd6..58099bc 100644
--- a/hw/xfree86/dixmods/Makefile.am
+++ b/hw/xfree86/dixmods/Makefile.am
@@ -14,12 +14,23 @@ if DBE
DBEMOD = libdbe.la
endif
-module_LTLIBRARIES = libafb.la \
- libcfb.la \
- libcfb32.la \
+if AFB
+AFBMOD = libafb.la
+endif
+
+if CFB
+CFBMOD = libcfb.la libcfb32.la
+endif
+
+if MFB
+MFBMOD = libmfb.la
+endif
+
+module_LTLIBRARIES = $(AFBMOD) \
+ $(CFBMOD) \
libfb.la \
libwfb.la \
- libmfb.la \
+ $(MFBMOD) \
libshadow.la
extsmoduledir = $(moduledir)/extensions
More information about the xorg-commit
mailing list