xserver: Branch 'master' - 3 commits
George Sapountzis
gsap7 at kemper.freedesktop.org
Sat Mar 1 09:51:59 PST 2008
GL/mesa/Makefile.am | 7 +-
GL/mesa/X/Makefile.am | 38 +++++-------
configure.ac | 118 +++++++++++++++++--------------------
hw/xfree86/common/xf86Helper.c | 1
hw/xfree86/ddc/xf86DDC.c | 9 --
hw/xfree86/int10/helper_exec.c | 2
hw/xfree86/parser/Screen.c | 1
hw/xfree86/parser/scan.c | 2
hw/xfree86/vbe/vbeModes.c | 3
mi/midash.c | 32 ----------
mi/miexpose.c | 2
mi/mioverlay.c | 1
mi/miwindow.c | 1
os/connection.c | 1
os/io.c | 129 -----------------------------------------
randr/rrscreen.c | 1
16 files changed, 77 insertions(+), 271 deletions(-)
New commits:
commit 3d642905477f4b1ec3223f1fbe0d0d37e959ec81
Author: George Sapountzis <gsap7 at yahoo.gr>
Date: Sat Mar 1 16:18:18 2008 +0200
clean some "unused" warnings
diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
index 0d2471a..1dd0bbc 100644
--- a/hw/xfree86/common/xf86Helper.c
+++ b/hw/xfree86/common/xf86Helper.c
@@ -1093,7 +1093,6 @@ xf86SetRootClip (ScreenPtr pScreen, Bool enable)
WindowPtr pChild;
Bool WasViewable = (Bool)(pWin->viewable);
Bool anyMarked = FALSE;
- RegionPtr pOldClip = NULL;
#ifdef DO_SAVE_UNDERS
Bool dosave = FALSE;
#endif
diff --git a/hw/xfree86/ddc/xf86DDC.c b/hw/xfree86/ddc/xf86DDC.c
index e47b8b8..28e2ead 100644
--- a/hw/xfree86/ddc/xf86DDC.c
+++ b/hw/xfree86/ddc/xf86DDC.c
@@ -13,8 +13,6 @@
#include "ddcPriv.h"
#include <string.h>
-static const OptionInfoRec *DDCAvailableOptions(void *unused);
-
#define RETRIES 4
static unsigned char *EDIDRead_DDC1(
@@ -58,13 +56,6 @@ static const OptionInfoRec DDCOptions[] = {
{ -1, NULL, OPTV_NONE, {0}, FALSE },
};
-/*ARGSUSED*/
-static const OptionInfoRec *
-DDCAvailableOptions(void *unused)
-{
- return (DDCOptions);
-}
-
/**
* Attempts to probe the monitor for EDID information, if NoDDC and NoDDC1 are
* unset. EDID information blocks are interpreted and the results returned in
diff --git a/hw/xfree86/int10/helper_exec.c b/hw/xfree86/int10/helper_exec.c
index e833426..de6fde5 100644
--- a/hw/xfree86/int10/helper_exec.c
+++ b/hw/xfree86/int10/helper_exec.c
@@ -46,8 +46,6 @@ static void SetResetBIOSVars(xf86Int10InfoPtr pInt, Bool set);
#define REG pInt
-static int pci_config_cycle = 0;
-
int
setup_int(xf86Int10InfoPtr pInt)
{
diff --git a/hw/xfree86/parser/Screen.c b/hw/xfree86/parser/Screen.c
index ad08c13..dfc02bb 100644
--- a/hw/xfree86/parser/Screen.c
+++ b/hw/xfree86/parser/Screen.c
@@ -508,7 +508,6 @@ xf86validateScreen (XF86ConfigPtr p)
{
XF86ConfScreenPtr screen = p->conf_screen_lst;
XF86ConfMonitorPtr monitor;
- XF86ConfDevicePtr device;
XF86ConfAdaptorLinkPtr adaptor;
while (screen)
diff --git a/hw/xfree86/parser/scan.c b/hw/xfree86/parser/scan.c
index 9706d48..1f9b1b8 100644
--- a/hw/xfree86/parser/scan.c
+++ b/hw/xfree86/parser/scan.c
@@ -612,7 +612,7 @@ DoSubstitution(const char *template, const char *cmdline, const char *projroot,
{
char *result;
int i, l;
- static const char *env = NULL, *home = NULL;
+ static const char *env = NULL;
static char *hostname = NULL;
static char majorvers[3] = "";
diff --git a/hw/xfree86/vbe/vbeModes.c b/hw/xfree86/vbe/vbeModes.c
index 061d7b6..fb730a7 100644
--- a/hw/xfree86/vbe/vbeModes.c
+++ b/hw/xfree86/vbe/vbeModes.c
@@ -127,10 +127,9 @@ CheckMode(ScrnInfoPtr pScrn, vbeInfoPtr pVbe, VbeInfoBlock *vbe, int id,
{
CARD16 major;
VbeModeInfoBlock *mode;
- DisplayModePtr pMode, p;
+ DisplayModePtr pMode;
VbeModeInfoData *data;
Bool modeOK = FALSE;
- ModeStatus status = MODE_OK;
major = (unsigned)(vbe->VESAVersion >> 8);
diff --git a/mi/midash.c b/mi/midash.c
index 912fb03..95a19c2 100644
--- a/mi/midash.c
+++ b/mi/midash.c
@@ -52,38 +52,6 @@ SOFTWARE.
#include "mistruct.h"
#include "mifpoly.h"
-static miDashPtr CheckDashStorage(miDashPtr *ppseg, int nseg, int *pnsegMax);
-
-#define NSEGDELTA 16
-
-/* returns a pointer to the pseg[nseg-1], growing the storage as
-necessary. this interface seems unnecessarily cumbersome.
-
-*/
-
-static miDashPtr
-CheckDashStorage(
- miDashPtr *ppseg, /* base pointer */
- int nseg, /* number of segment we want to write to */
- int *pnsegMax) /* size (in segments) of list so far */
-{
- if (nseg > *pnsegMax)
- {
- miDashPtr newppseg;
-
- *pnsegMax += NSEGDELTA;
- newppseg = (miDashPtr)xrealloc(*ppseg,
- (*pnsegMax)*sizeof(miDashRec));
- if (!newppseg)
- {
- xfree(*ppseg);
- return (miDashPtr)NULL;
- }
- *ppseg = newppseg;
- }
- return(*ppseg+(nseg-1));
-}
-
_X_EXPORT void
miStepDash (dist, pDashIndex, pDash, numInDashList, pDashOffset)
int dist; /* distance to step */
diff --git a/mi/miexpose.c b/mi/miexpose.c
index 2d3b0d5..5c2bd03 100644
--- a/mi/miexpose.c
+++ b/mi/miexpose.c
@@ -288,8 +288,6 @@ miHandleExposures(pSrcDrawable, pDstDrawable,
#endif
if (extents)
{
- WindowPtr pWin = (WindowPtr)pDstDrawable;
-
expBox = *REGION_EXTENTS(pscr, &rgnExposed);
REGION_RESET(pscr, &rgnExposed, &expBox);
}
diff --git a/mi/mioverlay.c b/mi/mioverlay.c
index a0adac5..6ddcc05 100644
--- a/mi/mioverlay.c
+++ b/mi/mioverlay.c
@@ -1528,7 +1528,6 @@ miOverlaySetShape(WindowPtr pWin)
{
Bool WasViewable = (Bool)(pWin->viewable);
ScreenPtr pScreen = pWin->drawable.pScreen;
- RegionPtr pOldClip = NULL;
#ifdef DO_SAVE_UNDERS
Bool dosave = FALSE;
#endif
diff --git a/mi/miwindow.c b/mi/miwindow.c
index 77cb750..cb8400c 100644
--- a/mi/miwindow.c
+++ b/mi/miwindow.c
@@ -938,7 +938,6 @@ miSetShape(pWin)
Bool WasViewable = (Bool)(pWin->viewable);
ScreenPtr pScreen = pWin->drawable.pScreen;
Bool anyMarked = FALSE;
- RegionPtr pOldClip = NULL;
#ifdef DO_SAVE_UNDERS
Bool dosave = FALSE;
#endif
diff --git a/os/connection.c b/os/connection.c
index 8b6541c..1ae50fe 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -546,7 +546,6 @@ AuthAudit (ClientPtr client, Bool letin,
{
char addr[128];
char *out = addr;
- int client_uid;
char client_uid_string[64];
LocalClientCredRec *lcc;
#ifdef XSERVER_DTRACE
diff --git a/os/io.c b/os/io.c
index be89021..e7ec609 100644
--- a/os/io.c
+++ b/os/io.c
@@ -91,8 +91,6 @@ _X_EXPORT CallbackListPtr FlushCallback;
static ConnectionInputPtr AllocateInputBuffer(void);
static ConnectionOutputPtr AllocateOutputBuffer(void);
-static xReqPtr PeekNextRequest(xReqPtr req, ClientPtr client, Bool readmore);
-static void SkipRequests(xReqPtr req, ClientPtr client, int numskipped);
/* check for both EAGAIN and EWOULDBLOCK, because some supposedly POSIX
* systems are broken and return EWOULDBLOCK when they should return EAGAIN
@@ -618,135 +616,8 @@ ResetCurrentRequest(ClientPtr client)
-/*****************************************************************
- * PeekNextRequest and SkipRequests were implemented to support DBE
- * idioms, but can certainly be used outside of DBE. There are two
- * related macros in os.h, ReqLen and CastxReq. See the porting
- * layer document for more details.
- *
- **********************/
-
-
-/*****************************************************************
- * PeekNextRequest
- * lets you look ahead at the unexecuted requests in a
- * client's request buffer.
- *
- * Note: this implementation of PeekNextRequest ignores the
- * readmore parameter.
- *
- **********************/
-
-static xReqPtr
-PeekNextRequest(
- xReqPtr req, /* request we're starting from */
- ClientPtr client, /* client whose requests we're skipping */
- Bool readmore) /* attempt to read more if next request isn't there? */
-{
- register ConnectionInputPtr oci = ((OsCommPtr)client->osPrivate)->input;
- xReqPtr pnextreq;
- int needed, gotnow, reqlen;
-
- if (!oci) return NULL;
-
- if (!req)
- {
- /* caller wants the request after the one currently being executed */
- pnextreq = (xReqPtr)
- (((CARD32 *)client->requestBuffer) + client->req_len);
- }
- else
- {
- /* caller wants the request after the one specified by req */
- reqlen = get_req_len(req, client);
-#ifdef BIGREQS
- if (!reqlen) reqlen = get_big_req_len(req, client);
-#endif
- pnextreq = (xReqPtr)(((char *)req) + (reqlen << 2));
- }
-
- /* see how much of the next request we have available */
-
- gotnow = oci->bufcnt - (((char *)pnextreq) - oci->buffer);
-
- if (gotnow < sizeof(xReq))
- return NULL;
-
- needed = get_req_len(pnextreq, client) << 2;
-#ifdef BIGREQS
- if (!needed)
- {
- /* it's a big request */
- if (gotnow < sizeof(xBigReq))
- return NULL;
- needed = get_big_req_len(pnextreq, client) << 2;
- }
-#endif
-
- /* if we have less than we need, return NULL */
-
- return (gotnow < needed) ? NULL : pnextreq;
-}
-
-/*****************************************************************
- * SkipRequests
- * lets you skip over some of the requests in a client's
- * request buffer. Presumably the caller has used PeekNextRequest
- * to examine the requests being skipped and has performed whatever
- * actions they dictate.
- *
- **********************/
-
_X_EXPORT CallbackListPtr SkippedRequestsCallback = NULL;
-static void
-SkipRequests(
- xReqPtr req, /* last request being skipped */
- ClientPtr client, /* client whose requests we're skipping */
- int numskipped) /* how many requests we're skipping */
-{
- OsCommPtr oc = (OsCommPtr)client->osPrivate;
- register ConnectionInputPtr oci = oc->input;
- int reqlen;
-
- /* see if anyone wants to snoop the skipped requests */
-
- if (SkippedRequestsCallback)
- {
- SkippedRequestInfoRec skipinfo;
- skipinfo.req = req;
- skipinfo.client = client;
- skipinfo.numskipped = numskipped;
- CallCallbacks(&SkippedRequestsCallback, &skipinfo);
- }
-
- /* adjust the sequence number */
- client->sequence += numskipped;
-
- /* twiddle the oci to skip over the requests */
-
- reqlen = get_req_len(req, client);
-#ifdef BIGREQS
- if (!reqlen) reqlen = get_big_req_len(req, client);
-#endif
- reqlen <<= 2;
- oci->bufptr = (char *)req;
- oci->lenLastReq = reqlen;
-
- /* see if any requests left in the buffer */
-
- if ( ((char *)req + reqlen) == (oci->buffer + oci->bufcnt) )
- {
- /* no requests; mark input buffer as available and client
- * as having no input
- */
- int fd = oc->fd;
- AvailableInput = oc;
- YieldControlNoInput();
- }
-}
-
-
/* lookup table for adding padding bytes to data that is read from
or written to the X socket. */
static int padlength[4] = {0, 3, 2, 1};
diff --git a/randr/rrscreen.c b/randr/rrscreen.c
index 811a557..f391973 100644
--- a/randr/rrscreen.c
+++ b/randr/rrscreen.c
@@ -731,7 +731,6 @@ ProcRRSetScreenConfig (ClientPtr client)
int n, rc;
ScreenPtr pScreen;
rrScrPrivPtr pScrPriv;
- TimeStamp configTime;
TimeStamp time;
int i;
Rotation rotation;
commit e7a6f79754816976d92857d55840262cccff80a6
Author: George Sapountzis <gsap7 at yahoo.gr>
Date: Sat Mar 1 16:16:29 2008 +0200
glcore: split mesa and X in build system
diff --git a/GL/mesa/Makefile.am b/GL/mesa/Makefile.am
index 99d3834..6d1a439 100644
--- a/GL/mesa/Makefile.am
+++ b/GL/mesa/Makefile.am
@@ -1,9 +1,10 @@
-SUBDIRS = main math swrast swrast_setup tnl shader X glapi vbo
+SUBDIRS = X
+SUBDIRS += main math swrast swrast_setup tnl shader glapi vbo
noinst_LTLIBRARIES = libGLcore.la
libGLcore_la_SOURCES = dummy.c
-libGLcore_la_LIBADD = main/libmain.la \
+MESA_LIBS = main/libmain.la \
math/libmath.la \
swrast/libswrast.la \
swrast_setup/libss.la \
@@ -12,4 +13,6 @@ libGLcore_la_LIBADD = main/libmain.la \
shader/grammar/libgrammar.la \
shader/slang/libslang.la \
vbo/libvbo.la \
+
+libGLcore_la_LIBADD = $(MESA_LIBS) \
X/libX.la
diff --git a/GL/mesa/X/Makefile.am b/GL/mesa/X/Makefile.am
index ace1181..d8abbc6 100644
--- a/GL/mesa/X/Makefile.am
+++ b/GL/mesa/X/Makefile.am
@@ -1,19 +1,10 @@
noinst_LTLIBRARIES = libX.la
INCLUDES = -I at MESA_SOURCE@/include \
- -I../X \
- -I../glapi \
- -I../main \
- -I../math \
- -I../shader \
- -I../swrast \
- -I../swrast_setup \
- -I../tnl \
- -I.. \
- -I../../glx \
- -I$(top_srcdir)/GL/glx \
- -I$(top_srcdir)/GL/include \
- -I$(top_srcdir)/hw/xfree86/os-support
+ -I. \
+ -I at MESA_SOURCE@/src/mesa/glapi \
+ -I at MESA_SOURCE@/src/mesa/main \
+ -I at MESA_SOURCE@/src/mesa
# -DXFree86Server is required because the X11 driver in Mesa thinks that
# symbol means "being built in the server"
@@ -22,12 +13,15 @@ AM_CFLAGS = \
-DXFree86Server \
@GLX_DEFINES@
-nodist_libX_la_SOURCES = \
- xm_api.c \
- xm_buffer.c \
- xm_dd.c \
- xm_image.c \
- xm_line.c \
- xm_span.c \
- xm_tri.c \
- drivers/common/driverfuncs.c
+XM_SOURCES = \
+ xm_api.c \
+ xm_buffer.c \
+ xm_dd.c \
+ xm_image.c \
+ xm_line.c \
+ xm_span.c \
+ xm_tri.c
+
+XM_SOURCES += drivers/common/driverfuncs.c
+
+nodist_libX_la_SOURCES = $(XM_SOURCES)
commit cdd46aa3cd2e720558186cdbe48d871ab385fcdd
Author: George Sapountzis <gsap7 at yahoo.gr>
Date: Sat Mar 1 15:57:57 2008 +0200
configure: minor cleanup
- dmx
- darwin: remove from xorg options
- xephyr: libxv is client lib
diff --git a/configure.ac b/configure.ac
index 10aa241..ebbf877 100644
--- a/configure.ac
+++ b/configure.ac
@@ -293,7 +293,6 @@ dnl Bus options and CPU capabilities. Replaces logic in
dnl hw/xfree86/os-support/bus/Makefile.am, among others.
dnl ---------------------------------------------------------------------------
DEFAULT_INT10="x86emu"
-use_x86_asm="no"
dnl Override defaults as needed for specific platforms:
@@ -310,10 +309,8 @@ case $host_cpu in
ARM_VIDEO=yes
;;
i*86)
- use_x86_asm="yes"
I386_VIDEO=yes
case $host_os in
- darwin*) use_x86_asm="no" ;;
*linux*) DEFAULT_INT10=vm86 ;;
*freebsd*) AC_DEFINE(USE_DEV_IO) ;;
*netbsd*) AC_DEFINE(USE_I386_IOPL)
@@ -337,10 +334,8 @@ case $host_cpu in
GLX_ARCH_DEFINES="-D__GLX_ALIGN64"
;;
x86_64*|amd64*)
- use_x86_asm="yes"
I386_VIDEO=yes
case $host_os in
- darwin*) use_x86_asm="no" ;;
*freebsd*) AC_DEFINE(USE_DEV_IO, 1, [BSD /dev/io]) ;;
*netbsd*) AC_DEFINE(USE_I386_IOPL, 1, [BSD i386 iopl])
SYS_LIBS=-lx86_64
@@ -758,7 +753,6 @@ if test "x$XV" = xyes; then
AC_DEFINE(XV, 1, [Support Xv extension])
AC_DEFINE(XvExtension, 1, [Build Xv extension])
REQUIRED_MODULES="$REQUIRED_MODULES videoproto"
- PKG_CHECK_MODULES(XV, [xv >= 0.22])
else
XVMC=no
fi
@@ -1160,9 +1154,6 @@ if test "x$GCC" = "xyes"; then
LD_EXPORT_SYMBOLS_FLAG="-rdynamic"
fi
case $host_os in
- darwin*)
- LD_EXPORT_SYMBOLS_FLAG=""
- ;;
openbsd*)
LD_EXPORT_SYMBOLS_FLAG="-Wl,--export-dynamic"
;;
@@ -1423,17 +1414,9 @@ if test "x$XORG" = xyes -o "x$XGL" = xyes; then
esac
case $host_cpu in
- i*86)
- case $host_os in
- darwin*) ;;
- *bsd*) ;;
- linux*) ;;
- *) xorg_bus_ix86pci=yes ;;
- esac
- ;;
powerpc*)
case $host_os in
- darwin*|linux*|freebsd*|netbsd*|openbsd*|kfreebsd*-gnu)
+ linux*|freebsd*|netbsd*|openbsd*|kfreebsd*-gnu)
;;
*)
xorg_bus_ppcpci="yes"
@@ -1444,9 +1427,9 @@ if test "x$XORG" = xyes -o "x$XGL" = xyes; then
xorg_bus_sparcpci="yes"
xorg_bus_sparc="yes"
;;
- x86_64*|amd64*)
+ i*86|x86_64*|amd64*)
case $host_os in
- darwin*|*bsd*|linux*)
+ *bsd*|linux*)
;;
*)
xorg_bus_ix86pci="yes"
@@ -1649,17 +1632,17 @@ fi
AC_MSG_RESULT([$XWIN])
if test "x$XWIN" = xyes; then
- XWIN_SERVER_NAME=XWin
case $host_os in
cygwin*)
+ XWIN_SERVER_NAME=XWin
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])
XWIN_SERVER_NAME=Xming
+ PKG_CHECK_MODULES([XWINMODULES],[x11 xdmcp xau xfont])
AC_DEFINE(RELOCATE_PROJECTROOT,1,[Make PROJECT_ROOT relative to the xserver location])
AC_DEFINE(HAS_WINSOCK,1,[Use Windows sockets])
XWIN_SYS_LIBS=-lwinsock2
@@ -1755,10 +1738,6 @@ if test "x$XQUARTZ" = xyes; then
AC_MSG_NOTICE([Disabling DGA extension])
DGA=no
fi
- if test "x$DMX" = xyes || test "x$DMX" = xauto; then
- AC_MSG_NOTICE([Disabling DMX DDX])
- DMX=no
- fi
fi
# Support for objc in autotools is minimal and not documented.
@@ -1801,51 +1780,58 @@ if test "x$LAUNCHD" = "xyes" ; then
fi
AM_CONDITIONAL(LAUNCHD, [test "x$LAUNCHD" = "xyes"])
+
+dnl DMX DDX
+
AC_MSG_CHECKING([whether to build Xdmx DDX])
PKG_CHECK_MODULES([DMXMODULES], [xmuu xext x11 xrender xfixes xfont xi dmxproto xau $XDMCP_MODULES], [have_dmx=yes], [have_dmx=no])
if test "x$DMX" = xauto; then
- DMX="$have_dmx"
+ DMX="$have_dmx"
+ case $host_os in
+ cygwin*) DMX="no" ;;
+ darwin*) DMX="no" ;;
+ esac
fi
AC_MSG_RESULT([$DMX])
AM_CONDITIONAL(DMX, [test "x$DMX" = xyes])
if test "x$DMX" = xyes; then
- if test "x$have_dmx" = xno; then
- AC_MSG_ERROR([Xdmx build explicitly requested, but required
- modules not found.])
- fi
- DMX_INCLUDES="$XEXT_INC $RENDER_INC $XTRAP_INC $RECORD_INC"
- XDMX_CFLAGS="$DMXMODULES_CFLAGS"
- XDMX_LIBS="$XEXT_LIB $FB_LIB $CONFIG_LIB $RENDER_LIB $XTRAP_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $MIEXT_SHADOW_LIB $MIEXT_DAMAGE_LIB"
- XDMX_SYS_LIBS="$DMXMODULES_LIBS"
- AC_SUBST([XDMX_CFLAGS])
- AC_SUBST([XDMX_LIBS])
- AC_SUBST([XDMX_SYS_LIBS])
+ if test "x$have_dmx" = xno; then
+ AC_MSG_ERROR([Xdmx build explicitly requested, but required
+ modules not found.])
+ fi
+ DMX_INCLUDES="$XEXT_INC $RENDER_INC $XTRAP_INC $RECORD_INC"
+ XDMX_CFLAGS="$DMXMODULES_CFLAGS"
+ XDMX_LIBS="$XEXT_LIB $FB_LIB $CONFIG_LIB $RENDER_LIB $XTRAP_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $MIEXT_SHADOW_LIB $MIEXT_DAMAGE_LIB"
+ XDMX_SYS_LIBS="$DMXMODULES_LIBS"
+ AC_SUBST([XDMX_CFLAGS])
+ AC_SUBST([XDMX_LIBS])
+ AC_SUBST([XDMX_SYS_LIBS])
dnl USB sources in DMX require <linux/input.h>
- AC_CHECK_HEADER([linux/input.h], DMX_BUILD_USB="yes",
- DMX_BUILD_USB="no")
+ AC_CHECK_HEADER([linux/input.h], DMX_BUILD_USB="yes",
+ DMX_BUILD_USB="no")
dnl Linux sources in DMX require <linux/keyboard.h>
- AC_CHECK_HEADER([linux/keyboard.h], DMX_BUILD_LNX="yes",
- DMX_BUILD_LNX="no")
- if test "x$GLX" = xyes; then
- PKG_CHECK_MODULES([GL], [glproto])
- fi
- PKG_CHECK_MODULES([XDMXCONFIG_DEP], [xaw7 xmu xt xpm x11])
- AC_SUBST(XDMXCONFIG_DEP_CFLAGS)
- AC_SUBST(XDMXCONFIG_DEP_LIBS)
- PKG_CHECK_MODULES([DMXEXAMPLES_DEP], [dmx xext x11])
- AC_SUBST(DMXEXAMPLES_DEP_LIBS)
- PKG_CHECK_MODULES([DMXXMUEXAMPLES_DEP], [dmx xmu xext x11])
- AC_SUBST(DMXXMUEXAMPLES_DEP_LIBS)
- PKG_CHECK_MODULES([DMXXIEXAMPLES_DEP], [dmx xi xext x11])
- AC_SUBST(DMXXIEXAMPLES_DEP_LIBS)
- PKG_CHECK_MODULES([XTSTEXAMPLES_DEP], [xtst xext x11])
- AC_SUBST(XTSTEXAMPLES_DEP_LIBS)
- PKG_CHECK_MODULES([XRESEXAMPLES_DEP], [xres xext x11])
- AC_SUBST(XRESEXAMPLES_DEP_LIBS)
- PKG_CHECK_MODULES([X11EXAMPLES_DEP], [xext x11])
- AC_SUBST(X11EXAMPLES_DEP_LIBS)
+ AC_CHECK_HEADER([linux/keyboard.h], DMX_BUILD_LNX="yes",
+ DMX_BUILD_LNX="no")
+ if test "x$GLX" = xyes; then
+ PKG_CHECK_MODULES([GL], [glproto])
+ fi
+ PKG_CHECK_MODULES([XDMXCONFIG_DEP], [xaw7 xmu xt xpm x11])
+ AC_SUBST(XDMXCONFIG_DEP_CFLAGS)
+ AC_SUBST(XDMXCONFIG_DEP_LIBS)
+ PKG_CHECK_MODULES([DMXEXAMPLES_DEP], [dmx xext x11])
+ AC_SUBST(DMXEXAMPLES_DEP_LIBS)
+ PKG_CHECK_MODULES([DMXXMUEXAMPLES_DEP], [dmx xmu xext x11])
+ AC_SUBST(DMXXMUEXAMPLES_DEP_LIBS)
+ PKG_CHECK_MODULES([DMXXIEXAMPLES_DEP], [dmx xi xext x11])
+ AC_SUBST(DMXXIEXAMPLES_DEP_LIBS)
+ PKG_CHECK_MODULES([XTSTEXAMPLES_DEP], [xtst xext x11])
+ AC_SUBST(XTSTEXAMPLES_DEP_LIBS)
+ PKG_CHECK_MODULES([XRESEXAMPLES_DEP], [xres xext x11])
+ AC_SUBST(XRESEXAMPLES_DEP_LIBS)
+ PKG_CHECK_MODULES([X11EXAMPLES_DEP], [xext x11])
+ AC_SUBST(X11EXAMPLES_DEP_LIBS)
fi
AM_CONDITIONAL([DMX_BUILD_LNX], [test "x$DMX_BUILD_LNX" = xyes])
AM_CONDITIONAL([DMX_BUILD_USB], [test "x$DMX_BUILD_USB" = xyes])
@@ -1909,7 +1895,11 @@ if test "$KDRIVE" = yes; then
XSDL_INCS="`sdl-config --cflags` $XSERVER_CFLAGS"
fi
- PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp, [xephyr="yes"], [xephyr="no"])
+ XEPHYR_REQUIRED_LIBS="x11 xext xfont xau xdmcp"
+ if test "x$XV" = xyes; then
+ XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS xv"
+ fi
+ PKG_CHECK_MODULES(XEPHYR, $XEPHYR_REQUIRED_LIBS, [xephyr="yes"], [xephyr="no"])
if test "x$XEPHYR" = xauto; then
XEPHYR=$xephyr
fi
@@ -1941,7 +1931,7 @@ if test "$KDRIVE" = yes; then
KDRIVE_OS_INC='-I$(top_srcdir)/hw/kdrive/linux'
KDRIVE_INCS="$KDRIVE_PURE_INCS $KDRIVE_OS_INC"
- KDRIVE_CFLAGS="$XSERVER_CFLAGS -DHAVE_KDRIVE_CONFIG_H $TSLIB_CFLAGS $XV_CFLAGS"
+ KDRIVE_CFLAGS="$XSERVER_CFLAGS -DHAVE_KDRIVE_CONFIG_H $TSLIB_CFLAGS"
KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $OS_LIB"
KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.a'
@@ -1955,10 +1945,10 @@ if test "$KDRIVE" = yes; then
KDRIVE_LOCAL_LIBS="$TSLIB_LIBS $DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB $CONFIG_LIB"
KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $FB_LIB $MI_LIB $KDRIVE_PURE_LIBS"
KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB $OS_LIB"
- KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $XV_LIBS"
+ KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS"
# check if we can build Xephyr
- PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp, [xephyr="yes"], [xephyr="no"])
+ PKG_CHECK_MODULES(XEPHYR, $XEPHYR_REQUIRED_LIBS, [xephyr="yes"], [xephyr="no"])
AC_SUBST([XEPHYR_LIBS])
AC_SUBST([XEPHYR_INCS])
More information about the xorg-commit
mailing list