[Libreoffice-commits] .: configure.ac

[Libreoffice Gerrit user]

 configure.ac |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit d23764182ccb5d1e96774cc958a7afaaa659e114
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Tue Nov 20 22:31:21 2012 +0100

    check harder whether to build cairo
    
    Change-Id: Ica2b9f1535f92c1b1cbceb7ec99ea96696742568

diff --git a/configure.ac b/configure.ac
index 1545ca8..20299e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9425,7 +9425,10 @@ if test $_os = Darwin -o $_os = iOS -o $_os = Android -o "$enable_headless" = "y
 fi
 ENABLE_GTK=""
 if test "x$enable_gtk" = "xyes"; then
-    test_cairo=yes
+    if test "$GUIBASE" = "unx"; then
+        # Used in vcl/Library_vclplug_gtk.mk
+        test_cairo=yes
+    fi
     ENABLE_GTK="TRUE"
     R="gtk $R"
 fi