summaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorOliver Specht <oliver.specht@cib.de>2016-03-30 09:18:58 +0200
committerOliver Specht <oliver.specht@cib.de>2016-04-05 12:11:50 +0000
commit0bb43aabab4fe772d2be7dfe3cc228473da19c2d (patch)
tree3d996ff5d9d99682c539eca4bc5bc2e27fae63f3 /configure.ac
parenttdf#91794 OSL_DEBUG_LEVEL > 1 removed in libo/filter module (diff)
downloadcore-0bb43aabab4fe772d2be7dfe3cc228473da19c2d.tar.gz
core-0bb43aabab4fe772d2be7dfe3cc228473da19c2d.zip
headless build: reset ENABLE_GLTF and use that setting as before
Change-Id: Iea54c59393c7c2955ec5fa321d9e9ea7b57b198a Reviewed-on: https://gerrit.libreoffice.org/23831 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Oliver Specht <oliver.specht@cib.de>
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 7ee051c8b766..d8f67a2528f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10463,7 +10463,7 @@ dnl Check whether to enable glTF support
dnl ===================================================================
AC_MSG_CHECKING([whether to enable glTF support])
ENABLE_GLTF=
-if test "x$enable_gltf" != "xno" -a $_os != iOS -a $_os != Android; then
+if test "x$enable_gltf" != "xno" -a $_os != iOS -a $_os != Android -a "$ENABLE_HEADLESS" = ""; then
ENABLE_GLTF=TRUE
AC_MSG_RESULT([yes])
AC_DEFINE(HAVE_FEATURE_GLTF,1)