summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2012-04-24 10:41:59 +0300
committerTor Lillqvist <tlillqvist@suse.com>2012-04-24 12:23:00 +0300
commit7e1516124bb05f9f40e1d724688b7b1a80327dfe (patch)
tree8fd12ba54905687d269e7f13e7c7bdfecb5d5512
parent0d0b7947aa7c7e9b1dafee8b99211b43f2ca1668 (diff)
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.
-rw-r--r--configure.in13
-rw-r--r--distro-configs/LibreOfficeMacOSX.conf1
-rw-r--r--distro-configs/LibreOfficeWin32.conf1
-rw-r--r--distro-configs/LibreOfficeWin64.conf1
4 files changed, 11 insertions, 5 deletions
diff --git a/configure.in b/configure.in
index a1568ec5024c..c9f270b9e1d2 100644
--- a/configure.in
+++ b/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)
diff --git a/distro-configs/LibreOfficeMacOSX.conf b/distro-configs/LibreOfficeMacOSX.conf
index 9366a046b277..108ef81c9d71 100644
--- a/distro-configs/LibreOfficeMacOSX.conf
+++ b/distro-configs/LibreOfficeMacOSX.conf
@@ -1,7 +1,6 @@
--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
diff --git a/distro-configs/LibreOfficeWin32.conf b/distro-configs/LibreOfficeWin32.conf
index 9bf76099df88..f608e9ba3391 100644
--- a/distro-configs/LibreOfficeWin32.conf
+++ b/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
diff --git a/distro-configs/LibreOfficeWin64.conf b/distro-configs/LibreOfficeWin64.conf
index 66404d450645..b4e21c68a74d 100644
--- a/distro-configs/LibreOfficeWin64.conf
+++ b/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