meson: Define HAVE_CONFIG_H as a project flag

Precisely what Autotools does, instead of adding it as per-target C
argument.

Once we remove HAVE_CONFIG_H checks in every source file, we'll be able
to drop it.

11 files changed, 8 insertions, 19 deletions

diff --git a/boilerplate/meson.build b/boilerplate/meson.build
index 79d1eeea4..0216b7a6c 100644
--- a/boilerplate/meson.build
+++ b/boilerplate/meson.build
@@ -35,8 +35,6 @@ cairo_boilerplate_constructors = custom_target('cairo-boilerplate-constructors.c
   command: [python3, files('make-cairo-boilerplate-constructors.py')[0], '@OUTPUT@', '@INPUT@'])
 
 libcairoboilerplate = static_library('cairoboilerplate', cairo_boilerplate_sources + [cairo_boilerplate_constructors],
-  c_args: ['-DHAVE_CONFIG_H'],
-  cpp_args: ['-DHAVE_CONFIG_H'],
   include_directories: [incbase, incsrc],
   dependencies: deps,
   link_with: [libcairo],
diff --git a/meson.build b/meson.build
index d4f759224..06df7f9c1 100644
--- a/meson.build
+++ b/meson.build
@@ -45,6 +45,9 @@ endif
 
 add_project_arguments('-D_GNU_SOURCE', language: 'c')
 
+# Autotools compatibility
+add_project_arguments('-DHAVE_CONFIG_H', language: 'c')
+
 # Make sure source directory hasn't been configured with autotools
 if meson.version().version_compare('>= 0.53')
   fs = import('fs')
diff --git a/src/meson.build b/src/meson.build
index f5d741eae..2905fdc8a 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -296,8 +296,8 @@ incsrc = include_directories('.')
 
 libcairo = library('cairo', cairo_sources,
   dependencies: deps,
-  c_args: cairo_no_warn_c_args + pthread_c_args + ['-DHAVE_CONFIG_H'],
-  cpp_args: cairo_no_warn_c_args + pthread_c_args + ['-DHAVE_CONFIG_H'],
+  c_args: cairo_no_warn_c_args + pthread_c_args,
+  cpp_args: cairo_no_warn_c_args + pthread_c_args,
   link_args: extra_link_args,
   soversion: cairo_version_sonum,
   version: cairo_libversion,
diff --git a/test/meson.build b/test/meson.build
index 0a7bf6d3a..cfe35a7dc 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -597,7 +597,6 @@ endif
 
 if build_any2ppm
   any2ppm_exe = executable('any2ppm', 'any2ppm.c',
-    c_args: ['-DHAVE_CONFIG_H'],
     include_directories: [incbase, incsrc, inccairoscript],
     link_with: [libcairo, libcairoscript],
     dependencies: deps + test_deps,
@@ -608,7 +607,7 @@ endif
 if have_shm
   cairo_test_trace_exe = executable('cairo-test-trace', cairo_test_trace_sources,
   include_directories: [incbase, incsrc, incboilerplate, incpdiff, inccairoscript, inccairomissing],
-  c_args: ['-DHAVE_CONFIG_H'] + pthread_c_args,
+  c_args: pthread_c_args,
   link_with: [libcairo, libcairoboilerplate, libpdiff, libcairoscript, libcairomissing],
   link_args: extra_link_args,
   dependencies: deps + test_deps + [rt_dep])
@@ -616,7 +615,6 @@ endif
 
 exe = executable('cairo-test-suite', [cairo_test_suite_sources, test_sources, cairo_test_constructors],
   include_directories: [incbase, incsrc, incboilerplate, incpdiff],
-  c_args: ['-DHAVE_CONFIG_H'],
   link_with: [libcairo, libcairoboilerplate, libpdiff],
   link_args: extra_link_args,
   dependencies: deps + test_deps,
diff --git a/test/pdiff/meson.build b/test/pdiff/meson.build
index 6400b95c2..30c6f1b5f 100644
--- a/test/pdiff/meson.build
+++ b/test/pdiff/meson.build
@@ -9,13 +9,11 @@ perceptualdiff_sources = [
 ]
 
 libpdiff = static_library('pdiff', libpdiff_sources,
-  c_args: ['-DHAVE_CONFIG_H'],
   include_directories: [incbase, incsrc],
   dependencies: deps,
   link_with: [libcairo],
 )
 
 perceptualdiff = executable('perceptualdiff', perceptualdiff_sources,
-  c_args: ['-DHAVE_CONFIG_H'],
   include_directories: [incbase, incsrc],
   link_with: [libpdiff])
diff --git a/util/cairo-fdr/meson.build b/util/cairo-fdr/meson.build
index 3cb66c678..001af27bc 100644
--- a/util/cairo-fdr/meson.build
+++ b/util/cairo-fdr/meson.build
@@ -4,7 +4,6 @@ cairo_fdr_sources = [
 
 libcairofdr = library('cairo-fdr', cairo_fdr_sources,
   include_directories: [incbase, incsrc],
-  c_args: ['-DHAVE_CONFIG_H'],
   dependencies: deps,
   install: true,
   install_dir: join_paths(get_option('prefix'), get_option('libdir'), 'cairo'),
diff --git a/util/cairo-gobject/meson.build b/util/cairo-gobject/meson.build
index bf24242a0..e4e3c8302 100644
--- a/util/cairo-gobject/meson.build
+++ b/util/cairo-gobject/meson.build
@@ -8,7 +8,6 @@ cairo_gobject_headers = [
 ]
 
 libcairogobject = library('cairo-gobject', cairo_gobject_sources,
-  c_args: ['-DHAVE_CONFIG_H'],
   include_directories: [incbase, incsrc],
   dependencies: [glib_dep, gobject_dep],
   link_with: [libcairo],
diff --git a/util/cairo-missing/meson.build b/util/cairo-missing/meson.build
index dd1507b59..18c6caf33 100644
--- a/util/cairo-missing/meson.build
+++ b/util/cairo-missing/meson.build
@@ -6,7 +6,6 @@ cairo_missing_sources = [
 inccairomissing = include_directories('.')
 
 libcairomissing = static_library('cairo-missing', cairo_missing_sources,
-  c_args: ['-DHAVE_CONFIG_H'],
   include_directories: [incbase, incsrc],
   install: false,
   build_by_default: false,
diff --git a/util/cairo-script/meson.build b/util/cairo-script/meson.build
index f50a200df..7a6b55818 100644
--- a/util/cairo-script/meson.build
+++ b/util/cairo-script/meson.build
@@ -26,7 +26,6 @@ csi_trace_sources = [
 
 libcairoscript = library('cairo-script-interpreter',
   cairoscript_interpreter_sources,
-  c_args: ['-DHAVE_CONFIG_H'],
   include_directories: [incbase, incsrc],
   dependencies: deps,
   link_with: [libcairo],
@@ -50,14 +49,12 @@ pkgmod.generate(libcairoscript,
 meson.override_dependency('cairo-script-interpreter', libcairoscript_dep)
 
 csi_replay_exe = executable('csi-replay', csi_replay_sources,
-  c_args: ['-DHAVE_CONFIG_H'],
   include_directories: [incbase, incsrc],
   link_with: [libcairo, libcairoscript],
   dependencies: deps,
 )
 
 csi_exec_exe = executable('csi-exec', csi_exec_sources,
-  c_args: ['-DHAVE_CONFIG_H'],
   include_directories: [incbase, incsrc],
   link_with: [libcairo, libcairoscript],
   dependencies: deps,
@@ -65,7 +62,6 @@ csi_exec_exe = executable('csi-exec', csi_exec_sources,
 
 if feature_conf.get('CAIRO_HAS_SCRIPT_SURFACE', 0) == 1 and conf.get('HAVE_LIBGEN_H', 0) == 1
   csi_trace_exe = executable('csi-trace', csi_trace_sources,
-    c_args: ['-DHAVE_CONFIG_H'],
     include_directories: [incbase, incsrc],
     link_with: [libcairo, libcairoscript],
     dependencies: deps,
diff --git a/util/cairo-sphinx/meson.build b/util/cairo-sphinx/meson.build
index cf560aefd..f779744b9 100644
--- a/util/cairo-sphinx/meson.build
+++ b/util/cairo-sphinx/meson.build
@@ -8,7 +8,6 @@ cairo_sphinx_sources = [
 
 libcairosphinx = library('cairo-sphinx', libcairo_sphinx_sources,
   include_directories: [incbase, incsrc],
-  c_args: ['-DHAVE_CONFIG_H'],
   dependencies: deps,
   install: true,
   install_dir: join_paths(get_option('prefix'), get_option('libdir'), 'cairo'),
@@ -18,7 +17,7 @@ libdir = join_paths(get_option('prefix'), get_option('libdir'))
 
 cairosphinx_exe = executable('cairo-sphinx', cairo_sphinx_sources,
   include_directories: [incbase, incsrc, inccairoscript, incboilerplate],
-  c_args: ['-DHAVE_CONFIG_H', '-DLIBDIR="@0@"'.format(libdir)] + pthread_c_args,
+  c_args: ['-DLIBDIR="@0@"'.format(libdir)] + pthread_c_args,
   dependencies: deps + [glib_dep, rt_dep],
   link_with: [libcairo, libcairosphinx, libcairoscript, libcairoboilerplate],
   link_args: extra_link_args,
diff --git a/util/cairo-trace/meson.build b/util/cairo-trace/meson.build
index 7048786eb..c4a504759 100644
--- a/util/cairo-trace/meson.build
+++ b/util/cairo-trace/meson.build
@@ -12,7 +12,7 @@ libcairotrace = library('cairo-trace', cairo_trace_sources,
   include_directories: [incbase, incsrc],
   dependencies: deps,
   link_args: extra_link_args,
-  c_args: ['-DSHARED_LIB_EXT="@0@"'.format(shared_lib_ext), '-DHAVE_CONFIG_H'] + pthread_c_args,
+  c_args: ['-DSHARED_LIB_EXT="@0@"'.format(shared_lib_ext),] + pthread_c_args,
   install: true,
   install_dir: join_paths(get_option('prefix'), get_option('libdir'), 'cairo'),
 )