Hardcode cairo canvas off for Mac OS X and Windows

Do not depend on a distro-configs file to disable it. It is supposed
to be optional to pass a --with-distro option. Running a bare
./autogen.sh is supposed to produce a working configuration.

configure.in

@@ -702,7 +702,7 @@ AC_ARG_ENABLE(split-opt-features,
 AC_ARG_ENABLE(cairo-canvas,
 [  --disable-cairo-canvas  Determines whether to build the Cairo canvas on
                           platforms where Cairo is available.
-],,enable_cairo_canvas=yes)
+])
 
 AC_ARG_ENABLE(librsvg,
     AS_HELP_STRING([--enable-librsvg=<no/auto/system/internal/fully-internal>],
@@ -8671,9 +8671,18 @@ if test "$enable_split_opt_features" = "yes"; then
 fi
 AC_SUBST(SPLIT_OPT_FEATURES)
 
+if test $_os = Darwin -o $_os = WINNT; then
+    if test "$enable_cairo_canvas" = yes; then
+        AC_MSG_WARN([Overriding with -disable-cairo-canvas for this platform])
+    fi
+    enable_cairo_canvas=no
+elif test -z "$enable_cairo_canvas"; then
+    enable_cairo_canvas=yes
+fi
+
 ENABLE_CAIRO_CANVAS="FALSE"
 if test "$enable_cairo_canvas" = "yes"; then
-   ENABLE_CAIRO_CANVAS="TRUE"
+    ENABLE_CAIRO_CANVAS="TRUE"
 fi
 AC_SUBST(ENABLE_CAIRO_CANVAS)
 

distro-configs/LibreOfficeMacOSX.conf

 --with-vendor=The Document Foundation
 --enable-epm
 --enable-binfilter
---disable-cairo-canvas
 --with-java-target-version=1.5
 --enable-ext-presenter-minimizer
 --enable-ext-presenter-console

distro-configs/LibreOfficeWin32.conf

@@ -8,7 +8,6 @@
 --with-java-target-version=1.5
 --disable-activex-component
 --enable-binfilter
---disable-cairo-canvas
 --enable-ext-scripting-beanshell
 --enable-ext-scripting-javascript
 --enable-ext-wiki-publisher

distro-configs/LibreOfficeWin64.conf

@@ -2,7 +2,6 @@
 --without-agfa-monotype-fonts
 --with-java-target-version=1.5
 --enable-cl-x64
---disable-cairo-canvas
 --disable-activex-component
 --enable-ext-scripting-beanshell
 --enable-ext-scripting-javascript