configure.ac | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
New commits: commit 7855aef5a5abea4c3c5630da042c868c59c5ace4 Author: LuboÅ¡ LuÅák <[email protected]> Date: Wed Nov 21 08:42:18 2012 +0100 we use gtk only for unix gui Change-Id: Id783d15cd18a101ef137df0bbf59e472d4a0a490 diff --git a/configure.ac b/configure.ac index 2937e9c..a121719 100644 --- a/configure.ac +++ b/configure.ac @@ -9420,7 +9420,7 @@ AC_SUBST(GTK3_CFLAGS) AC_SUBST(ENABLE_GTK3) AC_MSG_CHECKING([which VCLplugs shall be built]) -if test $_os = Darwin -o $_os = iOS -o $_os = Android -o "$enable_headless" = "yes"; then +if test "$GUIBASE" != "unx" -o "$enable_headless" = "yes"; then enable_gtk=no fi ENABLE_GTK="" commit e8f1df149e88ab494db4d32818ba9420d941208a Author: LuboÅ¡ LuÅák <[email protected]> Date: Wed Nov 21 08:40:57 2012 +0100 cairo will be tested for with guibase unx even without gtk Change-Id: I0f433e1fc42e3aff955867d8af3e4c1935794b7b diff --git a/configure.ac b/configure.ac index 20299e9..2937e9c 100644 --- a/configure.ac +++ b/configure.ac @@ -9425,10 +9425,6 @@ if test $_os = Darwin -o $_os = iOS -o $_os = Android -o "$enable_headless" = "y fi ENABLE_GTK="" if test "x$enable_gtk" = "xyes"; then - if test "$GUIBASE" = "unx"; then - # Used in vcl/Library_vclplug_gtk.mk - test_cairo=yes - fi ENABLE_GTK="TRUE" R="gtk $R" fi
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
