From 41094a7df54d4542ee5f201185fc96e3763a4804 Mon Sep 17 00:00:00 2001
From: emersion <contact@emersion.fr>
Date: Sat, 21 Jul 2018 13:08:23 +0100
Subject: [PATCH] Always include config.h

---
 backend/backend.c               | 3 ---
 backend/session/direct-ipc.c    | 1 -
 backend/session/logind.c        | 1 -
 backend/session/session.c       | 1 -
 backend/x11/backend.c           | 1 -
 backend/x11/input_device.c      | 1 -
 meson.build                     | 4 ++++
 types/tablet_v2/wlr_tablet_v2.c | 1 -
 xwayland/xwm.c                  | 1 -
 9 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/backend/backend.c b/backend/backend.c
index 78b90007..bf71ce31 100644
--- a/backend/backend.c
+++ b/backend/backend.c
@@ -13,10 +13,7 @@
 #include <wlr/backend/multi.h>
 #include <wlr/backend/session.h>
 #include <wlr/backend/wayland.h>
-#include <wlr/config.h>
 #include <wlr/util/log.h>
-
-/* WLR_HAS_X11_BACKEND needs to be after wlr/config.h */
 #ifdef WLR_HAS_X11_BACKEND
 #include <wlr/backend/x11.h>
 #endif
diff --git a/backend/session/direct-ipc.c b/backend/session/direct-ipc.c
index 5fdb95ac..bcaf7bba 100644
--- a/backend/session/direct-ipc.c
+++ b/backend/session/direct-ipc.c
@@ -13,7 +13,6 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
-#include <wlr/config.h>
 #include <wlr/util/log.h>
 #include <xf86drm.h>
 #ifdef __linux__
diff --git a/backend/session/logind.c b/backend/session/logind.c
index 2f816b95..47082c20 100644
--- a/backend/session/logind.c
+++ b/backend/session/logind.c
@@ -11,7 +11,6 @@
 #include <unistd.h>
 #include <wayland-server.h>
 #include <wlr/backend/session/interface.h>
-#include <wlr/config.h>
 #include <wlr/util/log.h>
 #include "util/signal.h"
 
diff --git a/backend/session/session.c b/backend/session/session.c
index 8d74bafe..67d20004 100644
--- a/backend/session/session.c
+++ b/backend/session/session.c
@@ -9,7 +9,6 @@
 #include <wayland-server.h>
 #include <wlr/backend/session.h>
 #include <wlr/backend/session/interface.h>
-#include <wlr/config.h>
 #include <wlr/util/log.h>
 #include <xf86drm.h>
 #include <xf86drmMode.h>
diff --git a/backend/x11/backend.c b/backend/x11/backend.c
index e0f5d6e7..077433a4 100644
--- a/backend/x11/backend.c
+++ b/backend/x11/backend.c
@@ -7,7 +7,6 @@
 #include <wayland-server.h>
 #include <wlr/backend/interface.h>
 #include <wlr/backend/x11.h>
-#include <wlr/config.h>
 #include <wlr/interfaces/wlr_input_device.h>
 #include <wlr/interfaces/wlr_keyboard.h>
 #include <wlr/interfaces/wlr_pointer.h>
diff --git a/backend/x11/input_device.c b/backend/x11/input_device.c
index a16da1c9..890dd629 100644
--- a/backend/x11/input_device.c
+++ b/backend/x11/input_device.c
@@ -1,5 +1,4 @@
 #include <stdlib.h>
-#include <wlr/config.h>
 #include <wlr/interfaces/wlr_input_device.h>
 #include <wlr/interfaces/wlr_keyboard.h>
 #include <wlr/interfaces/wlr_pointer.h>
diff --git a/meson.build b/meson.build
index b65cd51a..3aefd8f8 100644
--- a/meson.build
+++ b/meson.build
@@ -25,6 +25,10 @@ add_project_arguments(
 	'-I@0@'.format(meson.build_root()),
 	language: 'c',
 )
+add_project_arguments(
+	'-include@0@'.format(join_paths(meson.build_root(), 'include', 'wlr', 'config.h')),
+	language: 'c',
+)
 add_project_link_arguments(
 	'-Wl,-rpath,@0@'.format(meson.build_root()),
 	language: 'c',
diff --git a/types/tablet_v2/wlr_tablet_v2.c b/types/tablet_v2/wlr_tablet_v2.c
index fa058e79..9654e443 100644
--- a/types/tablet_v2/wlr_tablet_v2.c
+++ b/types/tablet_v2/wlr_tablet_v2.c
@@ -8,7 +8,6 @@
 #include <string.h>
 #include <wayland-server.h>
 #include <types/wlr_tablet_v2.h>
-#include <wlr/config.h>
 #include <wlr/types/wlr_seat.h>
 #include <wlr/types/wlr_tablet_tool.h>
 #include <wlr/types/wlr_tablet_v2.h>
diff --git a/xwayland/xwm.c b/xwayland/xwm.c
index 6632b5fc..9bf8068e 100644
--- a/xwayland/xwm.c
+++ b/xwayland/xwm.c
@@ -4,7 +4,6 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <wlr/config.h>
 #include <wlr/types/wlr_surface.h>
 #include <wlr/util/edges.h>
 #include <wlr/util/log.h>