[Libreoffice-commits] .: Branch 'libreoffice-3-5' - scp2/source scp2/util

[Thorsten Behrens]

 scp2/source/canvas/makefile.mk |    5 +----
 scp2/util/makefile.mk          |    5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

New commits:
commit 16a3beb02c016d972d4d1bd6f0889e91f5d7718d
Author: Riccardo Magliocchetti <riccardo.magliocchetti at gmail.com>
Date:   Wed Jan 25 12:00:45 2012 +0100

    Fix file not found: cairocanvas.uno.so in smoketestoo_native
    
    Signed-off-by: Thorsten Behrens <tbehrens at suse.com>

diff --git a/scp2/source/canvas/makefile.mk b/scp2/source/canvas/makefile.mk
index 7ce0257..d0d8362 100644
--- a/scp2/source/canvas/makefile.mk
+++ b/scp2/source/canvas/makefile.mk
@@ -41,12 +41,9 @@ PARFILES= canvascommons.par		\
           vclcanvas.par         \
 		  mtfrenderer.par
 
-.IF "$(GUI)"=="UNX"
-#X11 MacOSX has no cairo-canvas
-.IF "$(OS)" != "MACOSX" || "$(GUIBASE)" == "aqua"
+.IF "$(ENABLE_CAIRO_CANVAS)"=="TRUE"
 PARFILES+= cairocanvas.par
 .ENDIF
-.ENDIF
 
 .IF "$(ENABLE_DIRECTX)" != ""
 .IF "$(USE_DIRECTX5)" != ""
diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk
index 8362b6b..8c818fe 100644
--- a/scp2/util/makefile.mk
+++ b/scp2/util/makefile.mk
@@ -209,12 +209,9 @@ SCP1FILES += \
              vclcanvas.par \
 			 mtfrenderer.par
 
-.IF "$(GUI)"=="UNX"
-#X11 MacOSX has no cairo-canvas
-.IF "$(OS)" != "MACOSX" || "$(GUIBASE)" == "aqua"
+.IF "$(ENABLE_CAIRO_CANVAS)"=="TRUE"
 SCP1FILES += cairocanvas.par
 .ENDIF
-.ENDIF
 
 .IF "$(ENABLE_ONLINE_UPDATE)"!=""
 SCP1FILES += \