diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | Makefile.am | 30 | ||||
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | include/dix-config.h.in | 3 |
4 files changed, 44 insertions, 10 deletions
@@ -1,3 +1,12 @@ +2005-07-06 Alexander Gottwald <ago@freedesktop.org> + + * configure.ac: + * Makefile.am: + * include/dix-config.h: + Add more defines for XWin DDX + Make building of cfb*, afb and mfb conditional + Set FD_SETSIZE=256 on cygwin + 2005-07-05 Alexander Gottwald <ago@freedesktop.org> * hw/xwin/Makefile.am: diff --git a/Makefile.am b/Makefile.am index acd068ee1..f07500d54 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,6 +6,18 @@ endif if XTRAP XTRAP_DIR=XTrap endif +if CFB +CFB_DIR=cfb +CFB16_DIR=cfb16 +CFB24_DIR=cfb24 +CFB32_DIR=cfb32 +endif +if AFB +AFB_DIR=afb +endif +if MFB +MFB_DIR=mfb +endif SUBDIRS= \ include \ @@ -17,19 +29,19 @@ SUBDIRS= \ os \ randr \ render \ - Xi \ - mfb \ - xkb \ - afb \ - cfb \ - cfb16 \ - cfb24 \ - cfb32 \ + Xi \ + xkb \ + $(MFB_DIR) \ + $(AFB_DIR) \ + $(CFB_DIR) \ + $(CFB16_DIR) \ + $(CFB24_DIR) \ + $(CFB32_DIR) \ record \ xfixes \ damageext \ $(XTRAP_DIR) \ - $(COMPOSITE_DIR) \ + $(COMPOSITE_DIR) \ hw pkgconfigdir = $(libdir)/pkgconfig diff --git a/configure.ac b/configure.ac index 7fdd41137..b4a104a48 100644 --- a/configure.ac +++ b/configure.ac @@ -233,6 +233,8 @@ if test "$XWIN" = yes; then cygwin*) PKG_CHECK_MODULES([XWINMODULES],[x11 xdmcp xau xfont]) AC_DEFINE(HAS_DEVWINDOWS,1,[Cygwin has /dev/windows for signaling new win32 messages]) + AC_DEFINE(ROOTLESS,1,[Build Rootless code]) + CFLAGS="$CFLAGS -DFD_SETSIZE=256" ;; mingw*) PKG_CHECK_MODULES([XWINMODULES],[x11 xdmcp xau xfont]) @@ -264,6 +266,10 @@ if test "$XWIN" = yes; then AC_MSG_NOTICE([Disabling XF86Misc extension]) XF86MISC=no fi + if test "$COMPOSITE" = yes; then + AC_MSG_NOTICE([Disabling Composite extension]) + COMPOSITE=no + fi fi AM_CONDITIONAL(XWIN, [test x$XWIN = xyes]) AM_CONDITIONAL(XWIN_MULTIWINDOW, [test x$XWIN = xyes && true]) @@ -271,10 +277,14 @@ AM_CONDITIONAL(XWIN_MULTIWINDOWEXTWM, [test x$XWIN = xyes && false]) AM_CONDITIONAL(XWIN_CLIPBOARD, [test x$XWIN = xyes && true]) AM_CONDITIONAL(XWIN_GLX_WINDOWS, [test x$XWIN = xyes && false]) AM_CONDITIONAL(XWIN_NATIVEGDI, [test x$XWIN = xyes && false]) -AM_CONDITIONAL(XWIN_PRIMARYFB, [test x$XWIN = xyes && true]) +AM_CONDITIONAL(XWIN_PRIMARYFB, [test x$XWIN = xyes && false]) AM_CONDITIONAL(XWIN_RANDR, [test x$XWIN = xyes && true]) AM_CONDITIONAL(XWIN_XV, [test x$XWIN = xyes -a x$XV = xyes]) +AM_CONDITIONAL(MFB, [test x$XORG = xyes]) +AM_CONDITIONAL(CFB, [test x$XORG = xyes]) +AM_CONDITIONAL(AFB, [test x$XORG = xyes]) + AM_CONDITIONAL(XV, [test x$XV = xyes]) if test "$XV" = yes; then AC_DEFINE(XV,1,[Support Xv Extension]) diff --git a/include/dix-config.h.in b/include/dix-config.h.in index a50f59829..28ef45e2a 100644 --- a/include/dix-config.h.in +++ b/include/dix-config.h.in @@ -356,3 +356,6 @@ /* Define to `int' if <sys/types.h> does not define. */ #undef pid_t + +/* Build Rootless code */ +#undef ROOTLESS |