diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-05-25 14:57:29 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-05-27 09:55:01 +0200 |
| commit | d8f29baad6abd6f6b5c82458a6577beeba31f4dc (patch) | |
| tree | c69919270528dff527c8675b572f9cd0e3f44312 | |
| parent | wasm strip: squashed patches from Armin + fixes (diff) | |
| download | core-d8f29baad6abd6f6b5c82458a6577beeba31f4dc.tar.gz core-d8f29baad6abd6f6b5c82458a6577beeba31f4dc.zip | |
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
| -rw-r--r-- | m4/libo_externals.m4 | 30 | ||||
| -rw-r--r-- | xmloff/util/xo.chart.component (renamed from xmloff/util/xo.extended.component) | 0 |
2 files changed, 18 insertions, 12 deletions
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]) diff --git a/xmloff/util/xo.extended.component b/xmloff/util/xo.chart.component index 41fce7c6ec2d..41fce7c6ec2d 100644 --- a/xmloff/util/xo.extended.component +++ b/xmloff/util/xo.chart.component |