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

glamor: Use -lgl for Xephyr if GLX is unset. 

I'm experimenting with that because of conflicts with GL dispatch tables.
This commit is contained in:
Eric Anholt 2009-08-20 10:49:41 -07:00 committed by Zhigang Gong
parent 8885b3b1ff
commit 41e3e580de
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -1998,6 +1998,10 @@ if test "$KDRIVE" = yes; then
if test "x$DRI" = xyes && test "x$GLX" = xyes; then if test "x$DRI" = xyes && test "x$GLX" = xyes; then
XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS $LIBGL libdrm" XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS $LIBGL libdrm"
fi fi
# The glamor stuff requires libGL, but that conflicts with GLX currently.
if test "x$GLX" = xno; then
XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS gl"
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