From 96c1ae1d8e78ae8b9bd7d4001645cad24d62b720 Mon Sep 17 00:00:00 2001
From: Oliver Specht <oliver.specht@cib.de>
Date: Wed, 23 Mar 2016 13:40:13 +0100
Subject: fix headless build

disables OpenGL and glew usage, lets --without-gui do what
--without-x did before and disables X related test

Change-Id: I680b47c9962a0d43c8ece593db0b82e347ceebdb
Reviewed-on: https://gerrit.libreoffice.org/23474
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Oliver Specht <oliver.specht@cib.de>
---
 canvas/source/factory/cf_service.cxx | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'canvas/source')

diff --git a/canvas/source/factory/cf_service.cxx b/canvas/source/factory/cf_service.cxx
index e29a7fe9b4e2..3aa53db321d4 100644
--- a/canvas/source/factory/cf_service.cxx
+++ b/canvas/source/factory/cf_service.cxx
@@ -39,7 +39,10 @@
 #include <osl/mutex.hxx>
 #include <osl/process.h>
 #include <o3tl/functional.hxx>
+#include <config_features.h>
+#if HAVE_FEATURE_OPENGL
 #include <vcl/opengl/OpenGLWrapper.hxx>
+#endif
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -309,8 +312,10 @@ Reference<XInterface> CanvasFactory::lookupAndUse(
                      "ForceSafeServiceImpl" );
 
     // tdf#93870 - force VCL canvas in OpenGL mode for now.
+#if HAVE_FEATURE_OPENGL
     if( OpenGLWrapper::isVCLOpenGLEnabled() )
         bForceLastEntry = true;
+#endif
 
     // use anti-aliasing canvas, if config flag set (or not existing)
     bool bUseAAEntry(true);
-- 
cgit