[gdm] daemon, libgdm: allow wayland sessions with --disable-user-display-server

[Ray Strode <halfline src gnome org>]

commit 90f653cf3f1b962033db74c6203fd93296d339ca
Author: Ray Strode <rstrode redhat com>
Date:   Tue Sep 19 11:11:12 2017 -0400

    daemon,libgdm: allow wayland sessions with --disable-user-display-server
    
    Right now we hide wayland sessions from the list if the greeter isn't
    wayland.  The greeter is never wayland if built with
    --disable-user-display-server.
    
    This commit allows wayland sessions for the user session, when
    --disable-user-display-server --enable-wayland-support is specified,
    even though the greeter won't use wayland itself.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=787899

 daemon/gdm-manager.c  |    2 +-
 libgdm/gdm-sessions.c |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c
index a5fd159..e9f8465 100644
--- a/daemon/gdm-manager.c
+++ b/daemon/gdm-manager.c
@@ -2394,7 +2394,7 @@ create_user_session_for_display (GdmManager *manager,
                                 (GDestroyNotify)
                                 clean_user_session);
 
-#ifdef ENABLE_WAYLAND_SUPPORT
+#if defined(ENABLE_WAYLAND_SUPPORT) && defined(ENABLE_USER_DISPLAY_SERVER)
         greeter_is_wayland = g_strcmp0 (display_session_type, "wayland") == 0;
         g_object_set (G_OBJECT (session), "ignore-wayland", !greeter_is_wayland, NULL);
 #endif
diff --git a/libgdm/gdm-sessions.c b/libgdm/gdm-sessions.c
index a645224..4a5434e 100644
--- a/libgdm/gdm-sessions.c
+++ b/libgdm/gdm-sessions.c
@@ -213,9 +213,11 @@ collect_sessions (void)
         }
 
 #ifdef ENABLE_WAYLAND_SUPPORT
+#ifdef ENABLE_USER_DISPLAY_SERVER
         if (g_getenv ("WAYLAND_DISPLAY") == NULL && g_getenv ("RUNNING_UNDER_GDM") != NULL) {
                 return;
         }
+#endif
 
         for (i = 0; wayland_search_dirs [i] != NULL; i++) {
                 collect_sessions_from_directory (wayland_search_dirs [i]);