diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-06-11 15:21:51 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-06-11 16:13:32 +0000 |
| commit | 88f94fa76ffbfc3abba885480d7d2d2e05107d0a (patch) | |
| tree | 6501f63e3fe322b2df2fdc12508f72988f9f2203 | |
| parent | 7c3abee29c742593206b755b20a718c46f0780fa (diff) | |
Enable gtk3 by default
This just builds the gtk3 VCL plugin, it's still disabled by default at
runtime (see unx/generic/plugadapt/salplug.cxx).
Change-Id: I852e499cf1fbd1b218114f1091c4ba8a9a91a29d
Reviewed-on: https://gerrit.libreoffice.org/16229
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
| -rw-r--r-- | configure.ac | 11 | ||||
| -rw-r--r-- | distro-configs/LibreOfficeLinux.conf | 1 |
2 files changed, 7 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 879b370d3ea4..a09dc63c23dc 100644 --- a/configure.ac +++ b/configure.ac @@ -1116,7 +1116,7 @@ AC_ARG_ENABLE(gtk3, AS_HELP_STRING([--enable-gtk3], [Determines whether to use Gtk+ 3.0 vclplug on platforms where Gtk+ 3.0 is available. This is experimental and may not work.]), -,enable_gtk3=no) +,enable_gtk3=yes) AC_ARG_ENABLE(systray, AS_HELP_STRING([--disable-systray], @@ -9934,6 +9934,11 @@ dnl =================================================================== dnl Test which vclplugs have to be built. dnl =================================================================== R="" +AC_MSG_CHECKING([which VCLplugs shall be built]) +if test "$GUIBASE" != "unx" -o "$with_x" = "no"; then + enable_gtk=no + enable_gtk3=no +fi GTK3_CFLAGS="" GTK3_LIBS="" ENABLE_GTK3="" @@ -9954,10 +9959,6 @@ AC_SUBST(GTK3_LIBS) AC_SUBST(GTK3_CFLAGS) AC_SUBST(ENABLE_GTK3) -AC_MSG_CHECKING([which VCLplugs shall be built]) -if test "$GUIBASE" != "unx" -o "$with_x" = "no"; then - enable_gtk=no -fi ENABLE_GTK="" if test "x$enable_gtk" = "xyes"; then if test "$with_system_cairo" = no; then diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf index 2ab94d49c705..7c21ce777d48 100644 --- a/distro-configs/LibreOfficeLinux.conf +++ b/distro-configs/LibreOfficeLinux.conf @@ -36,3 +36,4 @@ --disable-gio --disable-randr-link --disable-kde4 +--disable-gtk3 |