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

xephyr: libGL is client lib

This commit is contained in:
George Sapountzis 2008-04-23 17:45:54 +03:00
parent a27c244d72
commit 7ffc68c5cc
2 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configure.ac
View File

@ -1917,6 +1917,10 @@ if test "$KDRIVE" = yes; then
if test "x$XV" = xyes; then if test "x$XV" = xyes; then
XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS xv" XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS xv"
fi fi
if test "x$DRI" = xyes && test "x$GLX" = xyes; then
XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS gl libdrm"
fi
PKG_CHECK_MODULES(XEPHYR, $XEPHYR_REQUIRED_LIBS, [xephyr="yes"], [xephyr="no"]) PKG_CHECK_MODULES(XEPHYR, $XEPHYR_REQUIRED_LIBS, [xephyr="yes"], [xephyr="no"])
if test "x$XEPHYR" = xauto; then if test "x$XEPHYR" = xauto; then
XEPHYR=$xephyr XEPHYR=$xephyr
@ -1924,10 +1928,6 @@ if test "$KDRIVE" = yes; then
XEPHYR_DRI=no XEPHYR_DRI=no
if test x$XEPHYR = xyes -a x$DRI = xyes && test "x$GLX" = xyes; then if test x$XEPHYR = xyes -a x$DRI = xyes && test "x$GLX" = xyes; then
XEPHYR_DRI=yes 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]) AC_DEFINE(XEPHYR_DRI,1,[enable DRI extension in xephyr])
fi fi
@ -1965,9 +1965,6 @@ if test "$KDRIVE" = yes; then
KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB $OS_LIB" KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB $OS_LIB"
KDRIVE_LIBS="$TSLIB_LIBS $KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS" KDRIVE_LIBS="$TSLIB_LIBS $KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS"
# check if we can build Xephyr
PKG_CHECK_MODULES(XEPHYR, $XEPHYR_REQUIRED_LIBS, [xephyr="yes"], [xephyr="no"])
AC_SUBST([XEPHYR_LIBS]) AC_SUBST([XEPHYR_LIBS])
AC_SUBST([XEPHYR_INCS]) AC_SUBST([XEPHYR_INCS])
AC_SUBST([XSDL_LIBS]) AC_SUBST([XSDL_LIBS])

12
hw/kdrive/ephyr/Makefile.am
View File

@ -2,15 +2,11 @@ INCLUDES = \
@KDRIVE_INCS@ \ @KDRIVE_INCS@ \
@KDRIVE_CFLAGS@ \ @KDRIVE_CFLAGS@ \
@XEPHYR_INCS@ \ @XEPHYR_INCS@ \
@XEPHYR_CFLAGS@ \
@DRIPROTO_CFLAGS@ \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/exa -I$(top_srcdir)/exa
if XEPHYR_HAS_DRI
INCLUDES += \
@LIBDRM_CFLAGS@ \
@DRIPROTO_CFLAGS@
endif
if XV if XV
LIBXEPHYR_HOSTXV=libxephyr-hostxv.a LIBXEPHYR_HOSTXV=libxephyr-hostxv.a
endif endif
@ -76,9 +72,7 @@ Xephyr_LDADD = \
$(LIBXEPHYR_HOSTDRI) \ $(LIBXEPHYR_HOSTDRI) \
$(top_builddir)/exa/libexa.la \ $(top_builddir)/exa/libexa.la \
@KDRIVE_LIBS@ \ @KDRIVE_LIBS@ \
@XEPHYR_LIBS@ \ @XEPHYR_LIBS@
@LIBDRM_LIBS@ \
@XEPHYR_DRI_LIBS@
Xephyr_DEPENDENCIES = \ Xephyr_DEPENDENCIES = \
libxephyr.a \ libxephyr.a \