diff options
| author | Tiago Vignatti <vignatti@c3sl.ufpr.br> | 2008-01-15 02:59:56 -0200 |
|---|---|---|
| committer | Tiago Vignatti <vignatti@c3sl.ufpr.br> | 2008-01-15 02:59:56 -0200 |
| commit | 315d6a2b1d2a3de308e98d548afe780c59a784fc (patch) | |
| tree | fb613de712be39fab7c92881c36878bf749731ae | |
| parent | 1f83f40525acd3aff8f50b3c519bc1f307ff1e19 (diff) | |
Fix Xephyr compilation without GLX.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | hw/kdrive/ephyr/ephyr.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 0742040c9..566ddcbd0 100644 --- a/configure.ac +++ b/configure.ac @@ -1901,7 +1901,7 @@ if test "$KDRIVE" = yes; then XEPHYR=$xephyr fi XEPHYR_DRI=no - if test x$XEPHYR = xyes -a x$DRI = xyes; then + if test x$XEPHYR = xyes -a x$DRI = xyes && test "x$GLX" = xyes; then XEPHYR_DRI=yes XEPHYR_DRI_LIBS=-lGL AC_SUBST(XEPHYR_DRI_LIBS) diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c index 2a762a2a9..c5c8a5640 100644 --- a/hw/kdrive/ephyr/ephyr.c +++ b/hw/kdrive/ephyr/ephyr.c @@ -635,7 +635,9 @@ ephyrInitScreen (ScreenPtr pScreen) if (!ephyrNoDRI && !hostx_has_dri ()) { EPHYR_LOG ("host x does not support DRI. Disabling DRI forwarding\n") ; ephyrNoDRI = TRUE ; +#ifdef GLXEXT noGlxVisualInit = FALSE ; +#endif } if (!ephyrNoDRI) { ephyrDRIExtensionInit (pScreen) ; |