diff options
| author | Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com> | 2014-12-22 19:10:59 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-02-07 00:01:41 +0000 |
| commit | b9a847b78ceaa3b5840429dab1bc50d35c7ef3de (patch) | |
| tree | 1bcd505077a08a8f24362e35362a0fad54bc9684 /configure.ac | |
| parent | 7ce1e0e1ecbb1b3ec5e3cc15306a9df7e786c564 (diff) | |
Fixup --without-x build
Accept gl linkage in hope of future offscreen mesa support.
Avoid linking with GLX though.
Change-Id: I4e666f60e74fe34075a8da9eeba95807cf8fe38c
Signed-off-by: Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/13452
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index e1f22548b332..d8401fc5b4e7 100644 --- a/configure.ac +++ b/configure.ac @@ -10210,6 +10210,7 @@ else fi AC_SUBST(ENABLE_VLC) +# this is for opengl transitions in impress slideshow ENABLE_OPENGL= if test $_os = iOS -o $_os = Android; then : # disable @@ -10226,7 +10227,9 @@ elif test $_os = WINNT; then SYSTEM_MESA_HEADERS= BUILD_TYPE="$BUILD_TYPE MESA" else - ENABLE_OPENGL=TRUE + if test "$with_x" != "no"; then + ENABLE_OPENGL=TRUE + fi ENABLE_OPENGL_CANVAS=TRUE dnl =================================================================== |