fontconfig: Branch 'main' - 2 commits

[GitLab Mirror]

 meson-config.h.in |    4 ++++
 meson.build       |    3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 7fcb591800262c982f4dd188d2f556e7fdbafca4
Merge: b7a8338 1b904a5
Author: Akira TAGOH <akira at tagoh.org>
Date:   Fri Feb 14 08:07:12 2025 +0000

    Merge branch 'meson-include-fixups' into 'main'
    
    meson: make sure config.h contains config-fixups.h for OSX
    
    See merge request fontconfig/fontconfig!363

commit 1b904a578103bb93ae3e1ba6415c86078635514b
Author: Akira TAGOH <akira at tagoh.org>
Date:   Fri Feb 14 16:53:38 2025 +0900

    meson: make sure config.h contains config-fixups.h for OSX

diff --git a/meson-config.h.in b/meson-config.h.in
new file mode 100644
index 0000000..6876417
--- /dev/null
+++ b/meson-config.h.in
@@ -0,0 +1,4 @@
+/* Copyright (C) 2025 fontconfig Authors */
+/* SPDX-License-Identifier: HPND */
+#include "meson-config.h"
+#include "config-fixups.h"
diff --git a/meson.build b/meson.build
index 5aacfc5..2e2be99 100644
--- a/meson.build
+++ b/meson.build
@@ -527,7 +527,8 @@ if not get_option('doc').disabled()
   subdir('doc')
 endif
 
-configure_file(output: 'config.h', configuration: conf)
+configure_file(output: 'meson-config.h', configuration: conf)
+configure_file(input: 'meson-config.h.in', output: 'config.h', copy: true)
 
 configure_file(output: 'fonts.conf',
                input: 'fonts.conf.in',