summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDeve <deveee@gmail.com>2019-01-09 00:10:27 +0100
committerJan Holesovsky <kendy@collabora.com>2019-06-05 22:19:26 +0200
commit0cacb0dfc089a2345deb2facfd19f55c0f27cb28 (patch)
tree257bc7e9a92fd48b093cff11b549afc61e5a0303
parent86560e6a675ea409c1f8408c38facfdfb904be72 (diff)
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: Michael Stahl <Michael.Stahl@cib.de>
-rw-r--r--configure.ac4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index c90fe5e14c9d..9b4cad2ed394 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10020,7 +10020,7 @@ dnl =================================================
dnl Check whether to build with dconf support.
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], [], [
if test "$enable_dconf" = yes; then
AC_MSG_ERROR([dconf not found])
@@ -10029,7 +10029,7 @@ if test "$enable_dconf" != no; then
fi])
fi
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_LIBS=
ENABLE_DCONF=