diff options
| author | Oliver Specht <oliver.specht@cib.de> | 2016-03-23 13:40:13 +0100 |
|---|---|---|
| committer | Oliver Specht <oliver.specht@cib.de> | 2016-03-25 11:05:47 +0000 |
| commit | 96c1ae1d8e78ae8b9bd7d4001645cad24d62b720 (patch) | |
| tree | 1482b9e0b899a783f64aaed3b9728533a81eff58 /configure.ac | |
| parent | 44a6d8ac3063511a149d4abdd6c2a556b3f477fe (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 'configure.ac')
| -rw-r--r-- | configure.ac | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index c81bd1aae570..7a2ec3bb744d 100644 --- a/configure.ac +++ b/configure.ac @@ -3760,7 +3760,6 @@ if test "$_os" = "WINNT" -a "$WITH_MINGW" != yes; then AC_MSG_CHECKING([whether to use ATL]) if test "$enable_atl" = "yes" -o "$enable_atl" = "" -a "$vcexpress" != Express; then DISABLE_ATL="" - AC_DEFINE(HAVE_FEATURE_ATL, 1) AC_MSG_RESULT([yes]) else DISABLE_ATL="TRUE" @@ -4572,12 +4571,17 @@ if test "$with_x" = "no"; then AC_MSG_ERROR([Use --disable-gui instead. How can we get rid of this option? No idea where it comes from.]) fi +ENABLE_HEADLESS="" if test "$enable_gui" = "no"; then if test "$USING_X11" != TRUE; then AC_MSG_ERROR([$host_os operating system is not suitable to build LibreOffice with --disable-gui.]) fi USING_X11= + ENABLE_HEADLESS=TRUE + AC_DEFINE(HAVE_FEATURE_UI,0) + test_cairo=yes fi +AC_SUBST(ENABLE_HEADLESS) WORKDIR="${BUILDDIR}/workdir" INSTDIR="${BUILDDIR}/instdir" @@ -10138,13 +10142,6 @@ if test "x$enable_kde4" = "xyes"; then fi AC_SUBST(ENABLE_KDE4) -ENABLE_HEADLESS="" -if test "x$with_x" = "xno" -o "$CXX" = "emcc"; then - ENABLE_HEADLESS="TRUE" - SCPDEFS="$SCPDEFS -DLIBO_HEADLESS" - R="headless" -fi -AC_SUBST(ENABLE_HEADLESS) build_vcl_plugins="$R" if test -z "$build_vcl_plugins"; then @@ -10431,16 +10428,18 @@ if test $_os = iOS -o $_os = Android; then elif test "$_os" = "Darwin"; then # We use frameworks on Mac OS X, no need for detail checks ENABLE_OPENGL=TRUE + AC_DEFINE(HAVE_FEATURE_OPENGL,1) ENABLE_OPENGL_CANVAS=TRUE elif test $_os = WINNT; then ENABLE_OPENGL=TRUE + AC_DEFINE(HAVE_FEATURE_OPENGL,1) ENABLE_OPENGL_CANVAS=TRUE else if test "$USING_X11" = TRUE; then ENABLE_OPENGL=TRUE - AC_CHECK_LIB(GL, glBegin, [:], AC_MSG_ERROR([libGL required.])) + AC_DEFINE(HAVE_FEATURE_OPENGL,1) + ENABLE_OPENGL_CANVAS=TRUE fi - ENABLE_OPENGL_CANVAS=TRUE fi AC_SUBST(ENABLE_OPENGL) |