diff options
| author | Rene Engelhard <rene@debian.org> | 2018-10-08 17:57:18 +0000 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2018-12-01 03:13:55 +0100 |
| commit | 662c911be415367673d2bca466d603c285638b64 (patch) | |
| tree | d834b7c24ffee9cab668238fb671766141c07df0 /configure.ac | |
| parent | fdd30f70aa4b1e8dba84e2d3c672756479d1a178 (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 | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index f2211ae58d4b..b029a539f790 100644 --- a/configure.ac +++ b/configure.ac @@ -594,7 +594,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 @@ -690,7 +689,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]) @@ -721,7 +719,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" @@ -749,7 +746,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" @@ -775,7 +771,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 @@ -4663,6 +4658,18 @@ if test "$OS" = "HAIKU"; then test_qt5=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 =================================================================== |