m4/libo_externals.m4 | 30 ++++++++++++++++++------------
1 file changed, 18 insertions(+), 12 deletions(-)
New commits:
commit df45cb78617eebcace731c2a8e61cc4aaec2a8cf
Author: Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Tue May 25 14:57:29 2021 +0200
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Mon Sep 26 20:54:32 2022 +0200
m4: Add test flag to libo_CHECK_SYSTEM_MODULE
Automatically adds an ENABLE_* AC_SUBST and test for a disabled
test via test_*, like ENABLE_EPUBGEN and test_libepubgen.
Change-Id: Ifaf27d4d1193f41de6291ab70d973fe151f36b2e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126169
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glo...@fbihome.de>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140049
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Tor Lillqvist <t...@collabora.com>
diff --git a/m4/libo_externals.m4 b/m4/libo_externals.m4
index f755358bb395..d19178ab8250 100644
--- a/m4/libo_externals.m4
+++ b/m4/libo_externals.m4
@@ -12,20 +12,26 @@ AC_ARG_WITH(system-$1,
[Use $1 from operating system instead of building and bundling it.]),,
[with_system_$1="$with_system_libs"])
AC_MSG_CHECKING([which $1 to use])
-if test "$with_system_$1" = "yes"; then
- AC_MSG_RESULT([external])
- SYSTEM_$2=TRUE
- PKG_CHECK_MODULES([$2], [$3])
- $2_CFLAGS=$(printf '%s' "${$2_CFLAGS}" | sed -e "s/-I/${ISYSTEM?}/g")
- FilterLibs "${$2_LIBS}"
- $2_LIBS="$filteredlibs"
+if test "$test_$1" != "no"; then
+ ENABLE_$2=TRUE
+ if test "$with_system_$1" = "yes"; then
+ AC_MSG_RESULT([external])
+ SYSTEM_$2=TRUE
+ PKG_CHECK_MODULES([$2], [$3])
+ $2_CFLAGS=$(printf '%s' "${$2_CFLAGS}" | sed -e "s/-I/${ISYSTEM?}/g")
+ FilterLibs "${$2_LIBS}"
+ $2_LIBS="$filteredlibs"
+ else
+ AC_MSG_RESULT([internal])
+ SYSTEM_$2=
+ $2_CFLAGS=$4
+ $2_LIBS=$5
+ BUILD_TYPE="$BUILD_TYPE $2"
+ fi
else
- AC_MSG_RESULT([internal])
- SYSTEM_$2=
- $2_CFLAGS=$4
- $2_LIBS=$5
- BUILD_TYPE="$BUILD_TYPE $2"
+ AC_MSG_RESULT([ignored])
fi
+AC_SUBST([ENABLE_$2])
AC_SUBST([SYSTEM_$2])
AC_SUBST([$2_CFLAGS])
AC_SUBST([$2_LIBS])
