summaryrefslogtreecommitdiff
path: root/desktop/source/app/sofficemain.cxx
diff options
context:
space:
mode:
authorOliver Specht <oliver.specht@cib.de>2016-03-23 13:40:13 +0100
committerOliver Specht <oliver.specht@cib.de>2016-03-25 11:05:47 +0000
commit96c1ae1d8e78ae8b9bd7d4001645cad24d62b720 (patch)
tree1482b9e0b899a783f64aaed3b9728533a81eff58 /desktop/source/app/sofficemain.cxx
parent44a6d8ac3063511a149d4abdd6c2a556b3f477fe (diff)
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>
Diffstat (limited to 'desktop/source/app/sofficemain.cxx')
-rw-r--r--desktop/source/app/sofficemain.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx
index 21f1e0c93169..f850cff97dd6 100644
--- a/desktop/source/app/sofficemain.cxx
+++ b/desktop/source/app/sofficemain.cxx
@@ -95,7 +95,10 @@ extern "C" int DESKTOP_DLLPUBLIC soffice_main()
/* Run test for OpenGL support in own process to avoid crash with broken
* OpenGL drivers. Start process as early as possible.
*/
- bool bSuccess = fire_glxtest_process();
+ bool bSuccess = false;
+#if HAVE_FEATURE_OPENGL
+ bSuccess = fire_glxtest_process();
+#endif
SAL_WARN_IF(!bSuccess, "desktop.opengl", "problems with glxtest");
#endif