Kaydet (Commit) b534c1ef authored tarafından Deve's avatar Deve Kaydeden (comit) Michael Stahl

Don't build dconf on Android and iOS.

Without that modification, it finds dconf in linux system and then compilation fails when it tries to build configmgr/source/dconf.cxx because dconf headers are not found in Android NDK.

Change-Id: I25ab7f1ce66ed491f08a526e462e00957135b0c2
Reviewed-on: https://gerrit.libreoffice.org/65987
Tested-by: Jenkins
Reviewed-by: 's avatarMichael Stahl <Michael.Stahl@cib.de>
üst 0515ffdb
...@@ -10455,7 +10455,7 @@ dnl ================================================= ...@@ -10455,7 +10455,7 @@ dnl =================================================
dnl Check whether to build with dconf support. dnl Check whether to build with dconf support.
dnl ================================================= dnl =================================================
if test "$enable_dconf" != no; then if test $_os != Android -a $_os != iOS -a "$enable_dconf" != no; then
PKG_CHECK_MODULES([DCONF], [dconf >= 0.15.2], [], [ PKG_CHECK_MODULES([DCONF], [dconf >= 0.15.2], [], [
if test "$enable_dconf" = yes; then if test "$enable_dconf" = yes; then
AC_MSG_ERROR([dconf not found]) AC_MSG_ERROR([dconf not found])
...@@ -10464,7 +10464,7 @@ if test "$enable_dconf" != no; then ...@@ -10464,7 +10464,7 @@ if test "$enable_dconf" != no; then
fi]) fi])
fi fi
AC_MSG_CHECKING([whether to enable dconf]) AC_MSG_CHECKING([whether to enable dconf])
if test "$enable_dconf" = no; then if test $_os = Android -o $_os = iOS -o "$enable_dconf" = no; then
DCONF_CFLAGS= DCONF_CFLAGS=
DCONF_LIBS= DCONF_LIBS=
ENABLE_DCONF= ENABLE_DCONF=
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment