Permalink
Browse files

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>
  • Loading branch information...
1 parent 7c3abee commit 88f94fa76ffbfc3abba885480d7d2d2e05107d0a @vmiklos vmiklos committed Jun 11, 2015
Showing with 7 additions and 5 deletions.
  1. +6 −5 configure.ac
  2. +1 −0 distro-configs/LibreOfficeLinux.conf
View
@@ -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
@@ -36,3 +36,4 @@
--disable-gio
--disable-randr-link
--disable-kde4
+--disable-gtk3

0 comments on commit 88f94fa

Please sign in to comment.