Commit 26e1fc7b authored by Dodji Seketeli's avatar Dodji Seketeli
Browse files

Xephyr: don't use Xv or GL when those are disabled.

parent 950f9995
......@@ -1855,10 +1855,13 @@ if test "$KDRIVE" = yes; then
XEPHYR_DRI=no
if test x$XEPHYR = xyes -a x$DRI = xyes; then
XEPHYR_DRI=yes
XEPHYR_DRI_LIBS=-lGL
AC_SUBST(XEPHYR_DRI_LIBS)
fi
if test x$XEPHYR_DRI = xyes ; then
AC_DEFINE(XEPHYR_DRI,1,[enable DRI extension in xephyr])
fi
AM_CONDITIONAL(XEPHYR_HAS_DRI, [test x$XEPHYR_DRI = xyes])
# Xephyr needs nanosleep() which is in librt on Solaris
AC_CHECK_FUNC([nanosleep], [],
......
......@@ -3,47 +3,65 @@ INCLUDES = \
@KDRIVE_CFLAGS@ \
-I$(srcdir)/../../../exa
noinst_LIBRARIES = libxephyr-hostx.a libxephyr-hostxv.a libxephyr.a
if XV
LIBXEPHYR_HOSTXV=libxephyr-hostxv.a
else
LIBXEPHYR_HOSTXV=
endif
bin_PROGRAMS = Xephyr
if XEPHYR_HAS_DRI
LIBXEPHYR_HOSTDRI=libxephyr-hostdri.a
else
LIBXEPHYR_HOSTDRI=
endif
noinst_LIBRARIES = libxephyr-hostx.a $(LIBXEPHYR_HOSTXV) $(LIBXEPHYR_HOSTDRI) libxephyr.a
bin_PROGRAMS = Xephyr
libxephyr_hostx_a_SOURCES = \
hostx.c \
hostx.h
libxephyr_hostx_a_INCLUDES = @XEPHYR_INCS@
libxephyr_hostxv_a_INCLUDES = @XEPHYR_INCS@
if XV
libxephyr_hostxv_a_SOURCES= \
ephyrhostvideo.c \
ephyrhostvideo.h
endif
if XEPHYR_HAS_DRI
libxephyr_hostdri_a_SOURCES= \
ephyrdriext.c \
ephyrdri.c \
ephyrdri.h \
XF86dri.c \
ephyrglxext.c \
ephyrglxext.h \
ephyrhostglx.c \
ephyrhostglx.h
libxephyr_hostdri_a_CFLAGS= \
-I$(top_srcdir) \
@LIBDRM_CFLAGS@ \
@DRIPROTO_CFLAGS@
endif
libxephyr_a_SOURCES = \
ephyr.c \
ephyr_draw.c \
ephyrvideo.c \
XF86dri.c \
ephyrdriext.c \
ephyrdri.c \
ephyrdri.h \
ephyrglxext.c \
ephyrglxext.h \
ephyrhostglx.c \
ephyrhostglx.h \
ephyrhostproxy.c \
ephyrhostproxy.h \
ephyrhostproxy.c \
ephyrproxyext.c \
ephyrproxyext.h \
os.c \
hostx.h \
ephyr.h \
ephyrlog.h
libxephyr_a_CFLAGS = \
@LIBDRM_CFLAGS@ \
-I$(top_srcdir) \
@DRIPROTO_CFLAGS@
@LIBDRM_CFLAGS@
Xephyr_SOURCES = \
ephyrinit.c
......@@ -51,17 +69,19 @@ Xephyr_SOURCES = \
Xephyr_LDADD = \
libxephyr.a \
libxephyr-hostx.a \
libxephyr-hostxv.a \
$(LIBXEPHYR_HOSTXV) \
$(LIBXEPHYR_HOSTDRI) \
../../../exa/libexa.la \
@KDRIVE_LIBS@ \
@XEPHYR_LIBS@ \
@LIBDRM_LIBS@ \
-lGL
@XEPHYR_DRI_LIBS@
Xephyr_DEPENDENCIES = \
libxephyr.a \
libxephyr-hostx.a \
libxephyr-hostxv.a \
$(LIBXEPHYR_HOSTXV) \
$(LIBXEPHYR_HOSTDRI) \
@KDRIVE_LOCAL_LIBS@
relink:
......
......@@ -36,7 +36,6 @@
#include "ephyrdri.h"
#include "ephyrdriext.h"
#include "ephyrglxext.h"
#include "ephyrproxyext.h"
#endif /*XEPHYR_DRI*/
extern int KdTsPhyScreen;
......@@ -640,7 +639,6 @@ ephyrInitScreen (ScreenPtr pScreen)
if (!ephyrNoDRI) {
ephyrDRIExtensionInit (pScreen) ;
ephyrHijackGLXExtension () ;
ephyrProxyExtensionInit ("ATIFGLRXDRI") ;
}
#endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment