diff --git a/configure.ac b/configure.ac
index 85d5b706f..10069be66 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1998,6 +1998,10 @@ if test "$KDRIVE" = yes; then
     if test "x$DRI" = xyes && test "x$GLX" = xyes; then
         XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS $LIBGL libdrm"
     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"])
     if test "x$XEPHYR" = xauto; then