From 7e1516124bb05f9f40e1d724688b7b1a80327dfe Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 24 Apr 2012 10:41:59 +0300 Subject: 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. --- distro-configs/LibreOfficeMacOSX.conf | 1 - distro-configs/LibreOfficeWin32.conf | 1 - distro-configs/LibreOfficeWin64.conf | 1 - 3 files changed, 3 deletions(-) (limited to 'distro-configs') 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 -- cgit