diff options
| author | Rene Engelhard <rene@debian.org> | 2018-10-08 17:57:18 +0000 |
|---|---|---|
| committer | Rene Engelhard <rene@debian.org> | 2018-10-09 18:24:37 +0200 |
| commit | 0450456ffd75936c30e38da9e5c35f5edc37e782 (patch) | |
| tree | 90cd9463fdccb7169a8743648cde265f6841d069 /configure.ac | |
| parent | 0cde3c332d2cc5c470998b6c1ba39705c64621b5 (diff) | |
make --enable-kde5 imply --enable-qt5
And explicitly fail if --enable-kde5 and --disable-qt5.
Change-Id: Ifa0cef6b065ca0825b1cb42922f6fcf676e457f1
Reviewed-on: https://gerrit.libreoffice.org/61571
Tested-by: Jenkins
Reviewed-by: Rene Engelhard <rene@debian.org>
Tested-by: Rene Engelhard <rene@debian.org>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 5f0f7080bced..a20e0be6c688 100644 --- a/configure.ac +++ b/configure.ac @@ -598,7 +598,6 @@ linux-gnu*|k*bsd*-gnu*) build_gstreamer_0_10=yes test_kde4=yes test_kde5=yes - test_qt5=yes test_gtk3_kde5=yes if test "$enable_fuzzers" != yes; then test_freetype=yes @@ -694,7 +693,6 @@ freebsd*) build_gstreamer_0_10=yes test_kde4=yes test_kde5=yes - test_qt5=yes test_gtk3_kde5=yes test_freetype=yes AC_MSG_CHECKING([the FreeBSD operating system release]) @@ -725,7 +723,6 @@ freebsd*) build_gstreamer_0_10=yes test_kde4=yes test_kde5=yes - test_qt5=yes test_gtk3_kde5=yes test_freetype=yes PTHREAD_LIBS="-pthread -lpthread" @@ -753,7 +750,6 @@ dragonfly*) build_gstreamer_0_10=yes test_kde4=yes test_kde5=yes - test_qt5=yes test_gtk3_kde5=yes test_freetype=yes PTHREAD_LIBS="-pthread" @@ -779,7 +775,6 @@ linux-android*) test_gtk=no test_kde4=no test_kde5=no - test_qt5=no test_gtk3_kde5=no test_randr=no test_xrender=no @@ -4690,10 +4685,21 @@ fi if test "$OS" = "HAIKU"; then enable_cairo_canvas=yes - test_qt5=yes test_kde5=yes fi +if test "$test_kde5" = "yes"; then + test_qt5=yes +fi + +if test "$test_kde5" = "yes" -a "$enable_kde5" = "yes"; then + if test "$enable_qt5" = "no"; then + AC_MSG_ERROR([KDE5 support depends on QT5, so it conflicts with --disable-qt5]) + else + enable_qt5=yes + fi +fi + dnl =================================================================== dnl check for cups support dnl =================================================================== |