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

Hook up lbx.

This commit is contained in:
Kristian Høgsberg 2005-10-14 22:44:56 +00:00
parent d62943c040
commit 21e7339c1e
5 changed files with 39 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2005-10-14 Kristian Høgsberg <krh@redhat.com>
* Makefile.am:
* configure.ac:
* include/dix-config.h.in:
* os/Makefile.am: Hook up lbx.
2005-10-14 Alan Coopersmith <alan.coopersmith@sun.com> 2005-10-14 Alan Coopersmith <alan.coopersmith@sun.com>
* configure.ac: * configure.ac:

7
Makefile.am
View File

@ -32,6 +32,10 @@ XPDDX_DIR=Xprint
XPCONFIG_DIR=XpConfig XPCONFIG_DIR=XpConfig
endif endif
if LBX
LBX_DIR=lbx
endif
SUBDIRS= \ SUBDIRS= \
doc \ doc \
include \ include \
@ -60,7 +64,8 @@ SUBDIRS= \
$(GLX_DIR) \ $(GLX_DIR) \
hw \ hw \
$(XPDDX_DIR) \ $(XPDDX_DIR) \
$(XPCONFIG_DIR) $(XPCONFIG_DIR) \
$(LBX_DIR)
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xorg-server.pc pkgconfig_DATA = xorg-server.pc

24
configure.ac
View File

@ -348,6 +348,7 @@ AC_ARG_ENABLE(xf86vidmode, [ --disable-xf86vidmode ], [XF86VIDMODE=$enableval
AC_ARG_ENABLE(xf86misc, [ --disable-xf86misc ], [XF86MISC=$enableval], [XF86MISC=yes]) AC_ARG_ENABLE(xf86misc, [ --disable-xf86misc ], [XF86MISC=$enableval], [XF86MISC=yes])
AC_ARG_ENABLE(xcsecurity, AS_HELP_STRING([--enable-xcsecurity], [Build Security extension (default: disabled)]),[XCSECURITY=$enableval],[XCSECURITY=no]) AC_ARG_ENABLE(xcsecurity, AS_HELP_STRING([--enable-xcsecurity], [Build Security extension (default: disabled)]),[XCSECURITY=$enableval],[XCSECURITY=no])
AC_ARG_ENABLE(xevie, AS_HELP_STRING([--enable-xevie], [Build XEvIE extension (default: disabled)]), [XEVIE=$enableval], [XEVIE=no]) AC_ARG_ENABLE(xevie, AS_HELP_STRING([--enable-xevie], [Build XEvIE extension (default: disabled)]), [XEVIE=$enableval], [XEVIE=no])
AC_ARG_ENABLE(lbx, AS_HELP_STRING([ --enable-xtrap ], [Build LBX (default: no)]), [LBX=$enableval], [LBX=no])
dnl DDXes. dnl DDXes.
AC_ARG_ENABLE(xorg, AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto]) AC_ARG_ENABLE(xorg, AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto])
@ -489,6 +490,14 @@ fi
AM_CONDITIONAL(GLX, test "x$GLX" = xyes) AM_CONDITIONAL(GLX, test "x$GLX" = xyes)
AC_SUBST([MESA_SOURCE]) AC_SUBST([MESA_SOURCE])
AM_CONDITIONAL(LBX, [test "x$LBX" = xyes])
if test "x$LBX" = xyes; then
AC_DEFINE(LBX, 1, [Support LBX extension])
PKG_CHECK_MODULES([LBXUTIL], [lbxutil])
LBX_LIB='$(top_builddir)/lbx/liblbx.la'" $LBXUTIL_LIBS"
LBX_INC='-I$(top_srcdir)/lbx'" $LBXUTIL_CFLAGS"
fi
AM_CONDITIONAL(DRI, test "x$DRI" = xyes) AM_CONDITIONAL(DRI, test "x$DRI" = xyes)
if test "x$DRI" = xyes; then if test "x$DRI" = xyes; then
AC_DEFINE(XF86DRI, 1, [Build DRI extension]) AC_DEFINE(XF86DRI, 1, [Build DRI extension])
@ -659,7 +668,7 @@ AC_EGREP_CPP([I_AM_SVR4],[
AC_DEFINE([SVR4],1,[Define to 1 on systems derived from System V Release 4]) AC_DEFINE([SVR4],1,[Define to 1 on systems derived from System V Release 4])
AC_MSG_RESULT([yes])], AC_MSG_RESULT([no])) AC_MSG_RESULT([yes])], AC_MSG_RESULT([no]))
XSERVER_CFLAGS="$XSERVER_CFLAGS $CORE_INCS $XEXT_INC $COMPOSITE_INC $DAMAGE_INC $FIXES_INC $XI_INC $MI_INC $MIEXT_SHADOW_INC $MIEXT_LAYER_INC $MIEXT_DAMAGE_INC $RENDER_INC $RANDR_INC $FB_INC" XSERVER_CFLAGS="$XSERVER_CFLAGS $CORE_INCS $XEXT_INC $COMPOSITE_INC $DAMAGE_INC $FIXES_INC $XI_INC $MI_INC $MIEXT_SHADOW_INC $MIEXT_LAYER_INC $MIEXT_DAMAGE_INC $RENDER_INC $RANDR_INC $FB_INC $LBX_INC"
AC_DEFINE_UNQUOTED(X_BYTE_ORDER,[$ENDIAN],[Endian order]) AC_DEFINE_UNQUOTED(X_BYTE_ORDER,[$ENDIAN],[Endian order])
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
@ -683,7 +692,7 @@ if test "x$DMX" = xyes; then
modules not found.]) modules not found.])
fi fi
DMX_INCLUDES="$XEXT_INC $RENDER_INC $XTRAP_INC $RECORD_INC" DMX_INCLUDES="$XEXT_INC $RENDER_INC $XTRAP_INC $RECORD_INC"
XDMX_LIBS="$FB_LIB $MI_LIB $XEXT_LIB $RENDER_LIB $XTRAP_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $MIEXT_DAMAGE_LIB $OS_LIB $MIEXT_SHADOW_LIB" XDMX_LIBS="$FB_LIB $MI_LIB $XEXT_LIB $RENDER_LIB $XTRAP_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $MIEXT_DAMAGE_LIB $LBX_LIB $OS_LIB $MIEXT_SHADOW_LIB"
AC_SUBST([XDMX_LIBS]) AC_SUBST([XDMX_LIBS])
dnl USB sources in DMX require <linux/input.h> dnl USB sources in DMX require <linux/input.h>
@ -721,7 +730,7 @@ AC_MSG_RESULT([$XVFB])
AM_CONDITIONAL(XVFB, [test "x$XVFB" = xyes]) AM_CONDITIONAL(XVFB, [test "x$XVFB" = xyes])
if test "x$XVFB" = xyes; then if test "x$XVFB" = xyes; then
XVFB_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $MIEXT_LAYER_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $OS_LIB" XVFB_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $MIEXT_LAYER_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $LBX_LIB $COMPOSITE_LIB $XPSTUBS_LIB $OS_LIB"
AC_SUBST([XVFB_LIBS]) AC_SUBST([XVFB_LIBS])
fi fi
@ -737,7 +746,7 @@ AC_MSG_RESULT([$XNEST])
AM_CONDITIONAL(XNEST, [test "x$XNEST" = xyes]) AM_CONDITIONAL(XNEST, [test "x$XNEST" = xyes])
if test "x$XNEST" = xyes; then if test "x$XNEST" = xyes; then
XNEST_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $MIEXT_LAYER_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $OS_LIB" XNEST_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $MIEXT_LAYER_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $LBX_LIB $COMPOSITE_LIB $XPSTUBS_LIB $OS_LIB"
AC_SUBST([XNEST_LIBS]) AC_SUBST([XNEST_LIBS])
fi fi
@ -760,7 +769,7 @@ if test "x$XORG" = xyes; then
XORG_INCS="$XORG_DDXINCS $XORG_OSINCS" XORG_INCS="$XORG_DDXINCS $XORG_OSINCS"
XORG_CFLAGS="$XORGSERVER_CFLAGS -DHAVE_XORG_CONFIG_H" XORG_CFLAGS="$XORGSERVER_CFLAGS -DHAVE_XORG_CONFIG_H"
XORG_CORE_LIBS="$DIX_LIB" XORG_CORE_LIBS="$DIX_LIB"
XORG_LIBS="$MI_LIB $FIXES_LIB $XEXT_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $MIEXT_LAYER_LIB $XI_LIB $XKB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $OS_LIB" XORG_LIBS="$MI_LIB $FIXES_LIB $XEXT_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $MIEXT_LAYER_LIB $XI_LIB $XKB_LIB $LBX_LIB $COMPOSITE_LIB $XPSTUBS_LIB $OS_LIB"
AC_CHECK_LIB([dl], [dlopen], XORG_LIBS="$XORG_LIBS -ldl") AC_CHECK_LIB([dl], [dlopen], XORG_LIBS="$XORG_LIBS -ldl")
@ -948,8 +957,8 @@ AM_CONDITIONAL(XPRINT, [test x$XPRINT = xyes])
if test "x$XPRINT" = xyes; then if test "x$XPRINT" = xyes; then
PKG_CHECK_MODULES([XPRINT], [printproto x11 xfont $XDMCP_MODULES xau]) PKG_CHECK_MODULES([XPRINT], [printproto x11 xfont $XDMCP_MODULES xau])
XPRINT_EXTENSIONS="$XEXT_LIB $XTRAP_LIB $RENDER_LIB $COMPOSITE_LIB $RANDR_LIB $XI_LIB $FIXES_LIB $DAMAGE_LIB $XI_LIB $GLX_LIBS" XPRINT_EXTENSIONS="$XEXT_LIB $XTRAP_LIB $RENDER_LIB $COMPOSITE_LIB $RANDR_LIB $XI_LIB $FIXES_LIB $LBX_LIB $DAMAGE_LIB $XI_LIB $GLX_LIBS"
XPRINT_INCLUDES="$XEXT_INC $RENDER_INC $COMPOSITE_INC $RANDR_INC $XI_INC $FIXES_INC $DAMAGE_INC $XI_INC $GLX_INC" XPRINT_INCLUDES="$XEXT_INC $RENDER_INC $COMPOSITE_INC $RANDR_INC $XI_INC $FIXES_INC $DAMAGE_INC $XI_INC $GLX_INC $LBX_INC"
XPRINT_LIBS="$XPRINT_LIBS $DIX_LIB $XKB_LIB $XKB_STUB_LIB $OS_LIB $XPRINT_EXTENSIONS $MI_LIB $MIEXT_DAMAGE_LIB $GLX_INC" XPRINT_LIBS="$XPRINT_LIBS $DIX_LIB $XKB_LIB $XKB_STUB_LIB $OS_LIB $XPRINT_EXTENSIONS $MI_LIB $MIEXT_DAMAGE_LIB $GLX_INC"
AC_SUBST([XPRINT_LIBS]) AC_SUBST([XPRINT_LIBS])
@ -1157,6 +1166,7 @@ doc/Makefile
fb/Makefile fb/Makefile
record/Makefile record/Makefile
XTrap/Makefile XTrap/Makefile
lbx/Makefile
mfb/Makefile mfb/Makefile
cfb/Makefile cfb/Makefile
cfb16/Makefile cfb16/Makefile

3
include/dix-config.h.in
View File

@ -356,6 +356,9 @@
/* Support Xv Extension */ /* Support Xv Extension */
#undef XV #undef XV
/* Build LBX */
#undef LBX
/* Support DRI support */ /* Support DRI support */
#undef XF86DRI #undef XF86DRI

8
os/Makefile.am
View File

@ -3,7 +3,6 @@ noinst_LTLIBRARIES = libos.la
AM_CFLAGS = $(DIX_CFLAGS) AM_CFLAGS = $(DIX_CFLAGS)
# k5auth.c \ # k5auth.c \
# lbxio.c \
# rpcauth.c \ # rpcauth.c \
# genalloca.c \ # genalloca.c \
# hpsocket.c \ # hpsocket.c \
@ -18,6 +17,10 @@ if XDMCP
XDMCP_SOURCES = xdmcp.c XDMCP_SOURCES = xdmcp.c
endif endif
if LBX
LBX_SOURCES = lbxio.c
endif
XORG_SOURCES = log.c XORG_SOURCES = log.c
libos_la_SOURCES = \ libos_la_SOURCES = \
@ -36,4 +39,5 @@ libos_la_SOURCES = \
xprintf.c \ xprintf.c \
$(XCSECURITY_SOURCES) \ $(XCSECURITY_SOURCES) \
$(XDMCP_SOURCES) \ $(XDMCP_SOURCES) \
$(XORG_SOURCES) $(XORG_SOURCES) \
$(LBX_SOURCES)