diff --git a/configure.ac b/configure.ac
index 82c845ba7..80daf828b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1772,7 +1772,11 @@ AM_CONDITIONAL([XF86VIDMODE], [test "x$XF86VIDMODE" = xyes])
 
 dnl glamor 
 
-AM_CONDITIONAL([GLAMOR], [test "x$XEPHYR" = xyes || test "x$GLAMOR_DDX" = xyes || test "x$GLAMOR" = xyes])
+if [test "x$XEPHYR" = xyes || test "x$GLAMOR_DDX" = xyes] ; then
+   GLAMOR=yes
+fi
+
+AM_CONDITIONAL([GLAMOR], [test "x$GLAMOR" = xyes])
 AM_CONDITIONAL([GLAMOR_GLES2], [test "x$GLAMOR_GLES2" = xyes])
 AM_CONDITIONAL([GLAMOR_DDX], [test "x$GLAMOR_DDX" = xyes])