diff --git a/configure.ac b/configure.ac
index 567e1b38e7..f1a2567a8a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -494,7 +494,7 @@ if test x"$EGL_WINDOW_SYSTEM" = x"auto"; then
 fi
 
 case "$EGL_WINDOW_SYSTEM" in
-  x11|none)
+  x11)
     PKG_CHECK_MODULES(EGL, egl, HAVE_EGL="yes", [
       HAVE_EGL="no"
       old_LIBS=$LIBS
@@ -594,6 +594,10 @@ case "$EGL_WINDOW_SYSTEM" in
     LIBS=$old_LIBS
     CFLAGS=$old_CFLAGS
     ;;
+  none|no)
+    HAVE_EGL="no"
+    AC_MSG_WARN([No EGL window system specified, will not build gstreamer-egl])
+    ;;
   *)
     AC_MSG_ERROR([invalid EGL window system specified])
     ;;