[PATCH RFC wayland 3/4] scanner: Take WAYLAND_VERSION from config.h

Daniel Stone daniels at collabora.com
Tue Nov 29 16:59:42 UTC 2016


Rather than including wayland-version.h, which may be a system file
anyway, just use config.h, since that's going to be there locally.

Signed-off-by: Daniel Stone <daniels at collabora.com>
---
 configure.ac  | 2 ++
 src/scanner.c | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index edf7141..73ed209 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,6 +20,8 @@ AC_SUBST([WAYLAND_VERSION], [wayland_version])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
+AC_DEFINE([WAYLAND_VERSION], ["wayland_version"], [Version of Wayland])
+
 AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz subdir-objects])
 
 AM_SILENT_RULES([yes])
diff --git a/src/scanner.c b/src/scanner.c
index a239c71..8d34e41 100644
--- a/src/scanner.c
+++ b/src/scanner.c
@@ -26,7 +26,6 @@
  */
 
 #include "config.h"
-#include "wayland-version.h"
 
 #include <stdbool.h>
 #include <stdio.h>
-- 
2.9.3



More information about the wayland-devel mailing list