strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

configure: Add gen to VCLplugs output

Browse source 
And move all the output handling into a single place.

Change-Id: Ia75440fc12a435b92239d7ec144be3d58e45d7d0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116110
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
This commit is contained in:
Jan-Marek Glogowski 2021-05-17 17:58:00 +02:00
parent 2d2eb0d4f4
commit 42a99a1755
1 changed files with 25 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
configure.ac
View file

@ -11406,7 +11406,7 @@ dnl AC_MSG_RESULT([sal_Int32])
dnl fi
dnl ===================================================================
dnl Test which vclplugs have to be built.
dnl Show which vclplugs will be built.
dnl ===================================================================
R=""
if test "$USING_X11" != TRUE; then
@ -11453,6 +11453,30 @@ if test "x$enable_kf5" = "xyes"; then
fi
AC_SUBST(ENABLE_KF5)
if test "x$USING_X11" = "xyes"; then
R="$R gen"
fi
if test "$_os" = "WINNT"; then
R="$R win"
elif test "$_os" = "Darwin"; then
R="$R osx"
elif test "$_os" = "iOS"; then
R="ios (builtin)"
fi
build_vcl_plugins="$R"
if test -z "$build_vcl_plugins"; then
build_vcl_plugins=" none"
fi
AC_MSG_NOTICE([VCLplugs to be built:${build_vcl_plugins}])
VCL_PLUGIN_INFO=$R
AC_SUBST([VCL_PLUGIN_INFO])
dnl ===================================================================
dnl Check for GTK libraries
dnl ===================================================================
GTK3_CFLAGS=""
GTK3_LIBS=""
if test "x$enable_gtk3" = "xyes" -o "x$enable_gtk3_kde5" = "xyes"; then
@ -11507,22 +11531,6 @@ if test "$enable_introspection" = yes; then
fi
fi
if test "$_os" = "WINNT"; then
R="$R win"
elif test "$_os" = "Darwin"; then
R="$R osx"
elif test "$_os" = "iOS"; then
R="ios (builtin)"
fi
build_vcl_plugins="$R"
if test -z "$build_vcl_plugins"; then
build_vcl_plugins="none"
fi
AC_MSG_NOTICE([VCLplugs to be built: $build_vcl_plugins])
VCL_PLUGIN_INFO=$R
AC_SUBST([VCL_PLUGIN_INFO])
dnl ===================================================================
dnl check for dbus support
dnl ===================================================================