From ff1384962449f4a2a1a6b2eada5582bdc2c61bd5 Mon Sep 17 00:00:00 2001
From: Björn Esser <besser82@fedoraproject.org>
Date: Wed, 27 Dec 2017 14:37:55 +0100
Subject: config: Avoid clash with other config-headers

---
 include/wlr/meson.build | 1 +
 include/wlr/xwayland.h  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 include/wlr/meson.build

(limited to 'include/wlr')

diff --git a/include/wlr/meson.build b/include/wlr/meson.build
new file mode 100644
index 00000000..508abfe7
--- /dev/null
+++ b/include/wlr/meson.build
@@ -0,0 +1 @@
+configure_file(output: 'config.h', install_dir: 'include/wlr', configuration: conf_data)
diff --git a/include/wlr/xwayland.h b/include/wlr/xwayland.h
index 37b09204..8d71a7ab 100644
--- a/include/wlr/xwayland.h
+++ b/include/wlr/xwayland.h
@@ -3,7 +3,7 @@
 
 #include <time.h>
 #include <stdbool.h>
-#include "config.h"
+#include <wlr/config.h>
 #include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_seat.h>
 #include <xcb/xcb.h>
-- 
cgit v1.2.3