From 21e7339c1eead1148eea462bc99cf8faf02c8d39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Fri, 14 Oct 2005 22:44:56 +0000 Subject: [PATCH] Hook up lbx. --- ChangeLog | 7 +++++++ Makefile.am | 7 ++++++- configure.ac | 24 +++++++++++++++++------- include/dix-config.h.in | 3 +++ os/Makefile.am | 8 ++++++-- 5 files changed, 39 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index e9c6e193d..e7515c209 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-10-14 Kristian Høgsberg + + * Makefile.am: + * configure.ac: + * include/dix-config.h.in: + * os/Makefile.am: Hook up lbx. + 2005-10-14 Alan Coopersmith * configure.ac: diff --git a/Makefile.am b/Makefile.am index b34a5061d..1c1af9b25 100644 --- a/Makefile.am +++ b/Makefile.am @@ -32,6 +32,10 @@ XPDDX_DIR=Xprint XPCONFIG_DIR=XpConfig endif +if LBX +LBX_DIR=lbx +endif + SUBDIRS= \ doc \ include \ @@ -60,7 +64,8 @@ SUBDIRS= \ $(GLX_DIR) \ hw \ $(XPDDX_DIR) \ - $(XPCONFIG_DIR) + $(XPCONFIG_DIR) \ + $(LBX_DIR) pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xorg-server.pc diff --git a/configure.ac b/configure.ac index 634901443..348b11f7d 100644 --- a/configure.ac +++ b/configure.ac @@ -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(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(lbx, AS_HELP_STRING([ --enable-xtrap ], [Build LBX (default: no)]), [LBX=$enableval], [LBX=no]) dnl DDXes. 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) 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) if test "x$DRI" = xyes; then 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_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]) dnl --------------------------------------------------------------------------- @@ -683,7 +692,7 @@ if test "x$DMX" = xyes; then modules not found.]) fi 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]) dnl USB sources in DMX require @@ -721,7 +730,7 @@ AC_MSG_RESULT([$XVFB]) AM_CONDITIONAL(XVFB, [test "x$XVFB" = xyes]) 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]) fi @@ -737,7 +746,7 @@ AC_MSG_RESULT([$XNEST]) AM_CONDITIONAL(XNEST, [test "x$XNEST" = xyes]) 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]) fi @@ -760,7 +769,7 @@ if test "x$XORG" = xyes; then XORG_INCS="$XORG_DDXINCS $XORG_OSINCS" XORG_CFLAGS="$XORGSERVER_CFLAGS -DHAVE_XORG_CONFIG_H" 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") @@ -948,8 +957,8 @@ AM_CONDITIONAL(XPRINT, [test x$XPRINT = xyes]) if test "x$XPRINT" = xyes; then 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_INCLUDES="$XEXT_INC $RENDER_INC $COMPOSITE_INC $RANDR_INC $XI_INC $FIXES_INC $DAMAGE_INC $XI_INC $GLX_INC" + 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 $LBX_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]) @@ -1157,6 +1166,7 @@ doc/Makefile fb/Makefile record/Makefile XTrap/Makefile +lbx/Makefile mfb/Makefile cfb/Makefile cfb16/Makefile diff --git a/include/dix-config.h.in b/include/dix-config.h.in index 62884a889..561303741 100644 --- a/include/dix-config.h.in +++ b/include/dix-config.h.in @@ -356,6 +356,9 @@ /* Support Xv Extension */ #undef XV +/* Build LBX */ +#undef LBX + /* Support DRI support */ #undef XF86DRI diff --git a/os/Makefile.am b/os/Makefile.am index 30c4b56c8..706f50539 100644 --- a/os/Makefile.am +++ b/os/Makefile.am @@ -3,7 +3,6 @@ noinst_LTLIBRARIES = libos.la AM_CFLAGS = $(DIX_CFLAGS) # k5auth.c \ -# lbxio.c \ # rpcauth.c \ # genalloca.c \ # hpsocket.c \ @@ -18,6 +17,10 @@ if XDMCP XDMCP_SOURCES = xdmcp.c endif +if LBX +LBX_SOURCES = lbxio.c +endif + XORG_SOURCES = log.c libos_la_SOURCES = \ @@ -36,4 +39,5 @@ libos_la_SOURCES = \ xprintf.c \ $(XCSECURITY_SOURCES) \ $(XDMCP_SOURCES) \ - $(XORG_SOURCES) + $(XORG_SOURCES) \ + $(LBX_SOURCES)