build: make xkbcommon built-time dependency

We really need xkbcommon-keysyms.h for building kmscon/uterm/TSM/etc.
However, the recent fix was ugly and didn't really help. Instead we copy
the keysyms file into external/xkbcommon/ so we can just include the real
xkbcommon files from any source but have a fallback in external/.

Hence, you can still build kmscon without xkbcommon with this fallback,
but this will be removed the first day when xkbcommon sees a public
release.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>

external/xkbcommon/xkbcommon-keysyms.h

@@ -2,7 +2,7 @@
  * COPIED FROM XKBCOMMON
  *
  * xkbcommon did not have a public stable release, yet. Therefore, many
- * distributions do not ship it and uterm can be built without it. However, we
+ * distributions do not ship it and kmscon can be built without it. However, we
  * still want to use the keysyms so we ship a copy of it.
  *
  * When xkbcommon sees a public stable release, we will add a build-time

src/main.c

@@ -31,6 +31,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/signalfd.h>
+#include <xkbcommon/xkbcommon-keysyms.h>
 #include "conf.h"
 #include "eloop.h"
 #include "log.h"

src/uterm.h

@@ -41,7 +41,6 @@
 #include <inttypes.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <uterm_keysyms.h>
 #include "eloop.h"
 
 /*

src/uterm_input.h

@@ -32,6 +32,7 @@
 #include <limits.h>
 #include <stdbool.h>
 #include <stdlib.h>
+#include <xkbcommon/xkbcommon-keysyms.h>
 #include "eloop.h"
 #include "uterm.h"
 

src/uterm_vt.c

@@ -40,6 +40,7 @@
 #include <sys/signalfd.h>
 #include <termios.h>
 #include <unistd.h>
+#include <xkbcommon/xkbcommon-keysyms.h>
 #include "eloop.h"
 #include "log.h"
 #include "shl_dlist.h"

src/vte.c

@@ -52,16 +52,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <xkbcommon/xkbcommon-keysyms.h>
 #include "console.h"
 #include "log.h"
 #include "main.h"
 #include "tsm_unicode.h"
 #include "vte.h"
 
-/* TODO: Change this to use "xkbcommon-keysyms.h" and add xkbcommon as
- * build-time dependency. See uterm_keysyms.h for more information. */
-#include "uterm_keysyms.h"
-
 #define LOG_SUBSYSTEM "vte"
 
 /* Input parser states */