meson.build: Conditionally build with headless support

[src/agl-compositor.git] / src / compositor.c

diff --git a/src/compositor.c b/src/compositor.c
index 22c4979..926cb2c 100644 (file)
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -39,7 +39,9 @@
 
 #include <libweston/backend-drm.h>
 #include <libweston/backend-wayland.h>
+#ifdef HAVE_BACKEND_HEADLESS
 #include <libweston/backend-headless.h>
+#endif
 #ifdef HAVE_BACKEND_X11
 #include <libweston/backend-x11.h>
 #endif
@@ -1087,6 +1089,7 @@ load_x11_backend(struct ivi_compositor *ivi, int *argc, char *argv[])
 }
 #endif
 
+#ifdef HAVE_BACKEND_HEADLESS
 static int
 load_headless_backend(struct ivi_compositor *ivi, int *argc, char **argv)
 {
@@ -1134,6 +1137,13 @@ load_headless_backend(struct ivi_compositor *ivi, int *argc, char **argv)
 
        return 0;
 }
+#else
+static int
+load_headless_backend(struct ivi_compositor *ivi, int *argc, char **argv)
+{
+       return -1;
+}
+#endif
 
 static int
 load_backend(struct ivi_compositor *ivi, const char *backend,
@@ -1177,6 +1187,14 @@ load_modules(struct ivi_compositor *ivi, const char *modules,
                        continue;
                }
 
+               if (strstr(buffer, "systemd-notify.so")) {
+                       weston_log("systemd-notify plug-in already loaded!\n");
+                       p = end;
+                       while (*p == ',')
+                               p++;
+                       continue;
+               }
+
                module_init = weston_load_module(buffer, "wet_module_init");
                if (!module_init)
                        return -1;
@@ -1240,7 +1258,7 @@ compositor_init_config(struct weston_compositor *compositor,
                                      &compositor->kb_repeat_delay, 400);
 
        weston_config_section_get_bool(section, "vt-switching",
-                                      &vt_switching, true);
+                                      &vt_switching, false);
        compositor->vt_switching = vt_switching;
 
        /* agl-compositor.ini [core] */