config_host.mk.in | 1 +
configure.ac | 7 +++++++
2 files changed, 8 insertions(+)
New commits:
commit 17679f5cacefbf55945a04c9b4c3d746a5bffc53
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Wed Apr 23 14:12:00 2025 +0200
Commit: Stephan Bergmann <stephan.bergm...@allotropia.de>
CommitDate: Wed Apr 23 19:03:08 2025 +0200
Pass NINJA into Meson in ExternalProject_harfbuzz
...otherwise my macOS build with autogen.input containing (among others)
> NINJA=/Users/stephan/lo/lode/opt/bin/ninja
would have failed building ExternalProject_harfbuzz with
> ERROR: Could not detect Ninja v1.8.2 or newer
Change-Id: I39260ae7fea9808fe26b9e63c3c7aaaa4c27103d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184502
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
diff --git a/config_host.mk.in b/config_host.mk.in
index bd987486ec5f..c947b47aefcd 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -524,6 +524,7 @@ export MYTHES_CFLAGS=$(gb_SPACE)@MYTHES_CFLAGS@
export MYTHES_LIBS=$(gb_SPACE)@MYTHES_LIBS@
export NASM=@NASM@
export NAFLAGS=@NAFLAGS@
+@x_NINJA@ export NINJA=@NINJA@
export NM=@NM@
export NSS_CFLAGS=$(gb_SPACE)@NSS_CFLAGS@
export NSS_LIBS=$(gb_SPACE)@NSS_LIBS@
diff --git a/configure.ac b/configure.ac
index a2923daa0ea8..b382f38ce54d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11502,6 +11502,13 @@ else
fi
fi
fi
+if test -z "$NINJA" || test "$NINJA" = 'assumed to be available from Visual
Studio'; then
+ x_NINJA=[\#]
+else
+ x_NINJA=
+fi
+AC_SUBST(x_NINJA)
+AC_SUBST(NINJA)
if test "$USING_X11" = TRUE; then
AC_PATH_X
