configure.ac | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
New commits:
commit 6594cb6aa556cc9ba279d29e040af33fd4d937be
Author: Rene Engelhard <r...@rene-engelhard.de>
AuthorDate: Sat Sep 13 12:11:03 2025 +0200
Commit: Michael Stahl <michael.st...@collabora.com>
CommitDate: Mon Sep 15 12:58:07 2025 +0200
move cargo check out of --with-yrs block and check also if building rust_uno
... since that also uses it
Change-Id: I04f5838579cb6e8a7b9ccdce3ba618bee7767049
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190915
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@collabora.com>
diff --git a/configure.ac b/configure.ac
index 4eeeefc3c19e..8b84a4992109 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2904,10 +2904,6 @@ AC_ARG_WITH(yrs,
[Enables very experimental experiments.]),[
WITH_YRS=$withval
if test "x$withval" != "xno"; then
- AC_PATH_PROG([CARGO], [cargo])
- if test -z "${CARGO}"; then
- AC_MSG_ERROR([install cargo to build yrs])
- fi
BUILD_TYPE="${BUILD_TYPE} YRS"
AC_DEFINE(ENABLE_YRS)
fi])
@@ -5940,6 +5936,13 @@ else
fi
AC_SUBST(ENABLE_RUST_UNO)
+if test "$WITH_YRS" = "yes" -o "$ENABLE_RUST_UNO" = "TRUE"; then
+ AC_PATH_PROG([CARGO], [cargo])
+ if test -z "${CARGO}"; then
+ AC_MSG_ERROR([install cargo to build rust components or use
--disable-yrs/--disable-rust-uno])
+ fi
+fi
+
DISABLE_GUI=""
if test "$enable_gui" = "no"; then
if test "$using_x11" != yes; then
