build: include config.h manually

Previously we included it with an `-include` compiler directive. But
that's not portable. And it's better to be explicit anyway.

Every .c file should have `include "config.h"` first thing.

Signed-off-by: Ran Benita <ran@unusedvar.com>

bench/bench.c

@@ -22,6 +22,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include "config.h"
+
 #include <assert.h>
 #include <stdio.h>
 #include <sys/time.h>

bench/compose.c

@@ -21,6 +21,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include "config.h"
+
 #include <time.h>
 
 #include "xkbcommon/xkbcommon-compose.h"

bench/key-proc.c

@@ -21,6 +21,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <time.h>
 

bench/rules.c

@@ -21,6 +21,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include "config.h"
+
 #include <time.h>
 
 #include "../test/test.h"

bench/rulescomp.c

@@ -21,6 +21,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include "config.h"
+
 #include <time.h>
 
 #include "../test/test.h"

fuzz/compose/target.c

@@ -3,6 +3,7 @@
  *
  * Currently, just parses an input file, and hopefully doesn't crash or hang.
  */
+#include "config.h"
 
 #include <assert.h>
 

fuzz/keymap/target.c

@@ -3,6 +3,7 @@
  *
  * Currently, just parses an input file, and hopefully doesn't crash or hang.
  */
+#include "config.h"
 
 #include <assert.h>
 

meson.build

@@ -115,7 +115,6 @@ else
     message('C library does not support secure_getenv, using getenv instead')
 endif
 configure_file(output: 'config.h', configuration: configh_data)
-add_project_arguments('-include', 'config.h', language: 'c')
 
 
 # Supports -Wl,--version-script?

src/atom.c

@@ -70,6 +70,8 @@
  *
  ********************************************************/
 
+#include "config.h"
+
 #include "utils.h"
 #include "atom.h"
 

src/compose/parser.c

@@ -52,6 +52,8 @@ OR PERFORMANCE OF THIS SOFTWARE.
 
 ******************************************************************/
 
+#include "config.h"
+
 #include <errno.h>
 
 #include "utils.h"

src/compose/paths.c

@@ -21,6 +21,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include "config.h"
+
 #include "utils.h"
 #include "paths.h"
 

src/compose/state.c

@@ -21,6 +21,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include "config.h"
+
 #include "table.h"
 #include "utils.h"
 #include "keysym.h"

src/compose/table.c

@@ -21,6 +21,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include "config.h"
+
 #include "utils.h"
 #include "table.h"
 #include "parser.h"

src/context-priv.c

@@ -24,6 +24,8 @@
  * Author: Daniel Stone <daniel@fooishbar.org>
  */
 
+#include "config.h"
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>

src/context.c

@@ -24,6 +24,8 @@
  * Author: Daniel Stone <daniel@fooishbar.org>
  */
 
+#include "config.h"
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>

src/keymap-priv.c

@@ -24,6 +24,8 @@
  * Author: Daniel Stone <daniel@fooishbar.org>
  */
 
+#include "config.h"
+
 #include "keymap.h"
 
 static void

src/keymap.c

@@ -50,6 +50,8 @@
  *
  * ********************************************************/
 
+#include "config.h"
+
 #include "keymap.h"
 #include "text.h"
 

src/keysym-utf.c

@@ -35,6 +35,8 @@
  *
  */
 
+#include "config.h"
+
 #include "xkbcommon/xkbcommon.h"
 #include "utils.h"
 #include "utf8.h"

src/keysym.c

@@ -47,6 +47,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include "config.h"
+
 #include <stdlib.h>
 #include "xkbcommon/xkbcommon.h"
 #include "utils.h"

src/state.c

@@ -59,6 +59,8 @@
  *   - messages (very unlikely)
  */
 
+#include "config.h"
+
 #include "keymap.h"
 #include "keysym.h"
 #include "utf8.h"

src/text.c

@@ -24,6 +24,8 @@
  *
  ********************************************************/
 
+#include "config.h"
+
 #include "keymap.h"
 #include "text.h"
 

src/utf8.c

@@ -24,6 +24,8 @@
  * Author: Rob Bradford <rob@linux.intel.com>
  */
 
+#include "config.h"
+
 #include <stddef.h>
 #include <stdbool.h>
 #include <inttypes.h>

src/utils.c

@@ -21,6 +21,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include "config.h"
+
 #include "utils.h"
 
 #ifdef HAVE_MMAP

src/x11/keymap.c

@@ -21,6 +21,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include "config.h"
+
 #include "x11-priv.h"
 
 /*

src/x11/state.c

@@ -21,6 +21,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include "config.h"
+
 #include "x11-priv.h"
 
 static bool

src/x11/util.c

@@ -21,6 +21,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include "config.h"
+
 #include "x11-priv.h"
 
 XKB_EXPORT int

src/xkbcomp/action.c

@@ -51,6 +51,8 @@
  *         Ran Benita <ran234@gmail.com>
  */
 
+#include "config.h"
+
 #include "xkbcomp-priv.h"
 #include "text.h"
 #include "expr.h"

src/xkbcomp/ast-build.c

@@ -51,6 +51,8 @@
  *         Ran Benita <ran234@gmail.com>
  */
 
+#include "config.h"
+
 #include "xkbcomp-priv.h"
 #include "ast-build.h"
 #include "include.h"

src/xkbcomp/compat.c

@@ -47,6 +47,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include "config.h"
+
 #include "xkbcomp-priv.h"
 #include "text.h"
 #include "expr.h"

src/xkbcomp/expr.c

@@ -24,6 +24,8 @@
  *
  ********************************************************/
 
+#include "config.h"
+
 #include "xkbcomp-priv.h"
 #include "text.h"
 #include "expr.h"

src/xkbcomp/include.c

@@ -47,6 +47,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include "config.h"
+
 #include <errno.h>
 #include <limits.h>
 #include <stdio.h>

src/xkbcomp/keycodes.c

@@ -24,6 +24,8 @@
  *
  ********************************************************/
 
+#include "config.h"
+
 #include "xkbcomp-priv.h"
 #include "text.h"
 #include "expr.h"

src/xkbcomp/keymap-dump.c

@@ -49,6 +49,8 @@
  * Author: Daniel Stone <daniel@fooishbar.org>
  */
 
+#include "config.h"
+
 #include "xkbcomp-priv.h"
 #include "text.h"
 

src/xkbcomp/keymap.c

@@ -27,6 +27,8 @@
  *         Ran Benita <ran234@gmail.com>
  */
 
+#include "config.h"
+
 #include "xkbcomp-priv.h"
 
 static void

src/xkbcomp/keywords.c

@@ -29,6 +29,7 @@
 #error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
 #endif
 
+#include "config.h"
 
 #include "xkbcomp-priv.h"
 #include "parser-priv.h"

src/xkbcomp/parser.y

@@ -31,6 +31,8 @@
  */
 
 %{
+#include "config.h"
+
 #include "xkbcomp/xkbcomp-priv.h"
 #include "xkbcomp/ast-build.h"
 #include "xkbcomp/parser-priv.h"

src/xkbcomp/rules.c

@@ -47,6 +47,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include "config.h"
+
 #include "xkbcomp-priv.h"
 #include "rules.h"
 #include "include.h"

src/xkbcomp/scanner.c

@@ -21,6 +21,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include "config.h"
+
 #include "xkbcomp-priv.h"
 #include "parser-priv.h"
 #include "scanner-utils.h"

src/xkbcomp/symbols.c

@@ -51,6 +51,8 @@
  *         Ran Benita <ran234@gmail.com>
  */
 
+#include "config.h"
+
 #include "xkbcomp-priv.h"
 #include "text.h"
 #include "expr.h"

src/xkbcomp/types.c

@@ -24,6 +24,8 @@
  *
  ********************************************************/
 
+#include "config.h"
+
 #include "xkbcomp-priv.h"
 #include "text.h"
 #include "vmod.h"

src/xkbcomp/vmod.c

@@ -24,6 +24,8 @@
  *
  ********************************************************/
 
+#include "config.h"
+
 #include "xkbcomp-priv.h"
 #include "text.h"
 #include "expr.h"

src/xkbcomp/xkbcomp.c

@@ -27,6 +27,8 @@
  *          Daniel Stone <daniel@fooishbar.org>
  */
 
+#include "config.h"
+
 #include "xkbcomp-priv.h"
 #include "rules.h"
 

test/atom.c

@@ -21,6 +21,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include "config.h"
+
 #include <time.h>
 
 #include "test.h"

test/buffercomp.c

@@ -21,6 +21,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include "config.h"
+
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>

test/common.c

@@ -30,6 +30,8 @@
  *         Ran Benita <ran234@gmail.com>
  */
 
+#include "config.h"
+
 #include <limits.h>
 #include <fcntl.h>
 #include <unistd.h>

test/compose.c

@@ -21,6 +21,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include "config.h"
+
 #include "xkbcommon/xkbcommon-compose.h"
 
 #include "test.h"

test/context.c

@@ -23,6 +23,8 @@
  * Author: Daniel Stone <daniel@fooishbar.org>
  */
 
+#include "config.h"
+
 #include "test.h"
 #include "context.h"
 

test/filecomp.c

@@ -21,6 +21,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include "config.h"
+
 #include "test.h"
 
 static int

test/interactive-evdev.c

@@ -21,6 +21,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include "config.h"
+
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>

test/interactive-wayland.c

@@ -23,6 +23,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include "config.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <locale.h>

test/interactive-x11.c

@@ -21,13 +21,15 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include "config.h"
+
 #include <locale.h>
 
+#include <xcb/xkb.h>
+
 #include "xkbcommon/xkbcommon-x11.h"
 #include "test.h"
 
-#include <xcb/xkb.h>
-
 /*
  * Note: This program only handles the core keyboard device for now.
  * It should be straigtforward to change struct keyboard to a list of

test/keymap.c

@@ -23,6 +23,8 @@
  * Author: Mike Blumenkrantz <zmike@osg.samsung.com>
  */
 
+#include "config.h"
+
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>

test/keyseq.c

@@ -21,6 +21,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include "config.h"
+
 #include "evdev-scancodes.h"
 #include "test.h"
 

test/keysym.c

@@ -20,6 +20,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+#include "config.h"
+
 #include <locale.h>
 
 #include "test.h"

test/log.c

@@ -21,6 +21,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include "config.h"
+
 #include "test.h"
 #include "context.h"
 

test/print-compiled-keymap.c

@@ -21,6 +21,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include "config.h"
+
 #include <unistd.h>
 
 #include "test.h"

test/rmlvo-to-kccgst.c

@@ -21,6 +21,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include "config.h"
+
 #include <unistd.h>
 #include <getopt.h>
 

test/rmlvo-to-keymap.c

@@ -21,6 +21,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include "config.h"
 
 #include <assert.h>
 #include <errno.h>
@@ -29,6 +30,7 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include "xkbcommon/xkbcommon.h"
 
 static bool print = false;

test/rules-file-includes.c

@@ -22,6 +22,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include "config.h"
 #include "test-config.h"
 
 #include "test.h"

test/rules-file.c

@@ -21,6 +21,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include "config.h"
+
 #include "test.h"
 #include "xkbcomp/xkbcomp-priv.h"
 #include "xkbcomp/rules.h"

test/rulescomp.c

@@ -21,6 +21,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include "config.h"
+
 #include "evdev-scancodes.h"
 #include "test.h"
 

test/state.c

@@ -23,6 +23,8 @@
  * Author: Daniel Stone <daniel@fooishbar.org>
  */
 
+#include "config.h"
+
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>

test/stringcomp.c

@@ -21,6 +21,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include "config.h"
+
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>

test/utf8.c

@@ -21,6 +21,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include "config.h"
+
 #include <assert.h>
 #include <inttypes.h>
 #include <stdbool.h>

test/x11.c

@@ -21,6 +21,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include "config.h"
+
 #include "test.h"
 #include "xkbcommon/xkbcommon-x11.h"
 

test/x11comp.c

@@ -21,6 +21,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <spawn.h>
 #include <unistd.h>