Commits

Anonymous committed 56bc1b6

vcl340fixes: #i117804# differentiate between ENABLE_CAIRO and ENABLE_CAIRO_CANVAS

Comments (0)

Files changed (7)

canvas/source/cairo/makefile.mk

 .INCLUDE :	settings.mk
 DLLPRE =
 
-# --- Nothing to do if we're compiling with --disable-cairo -----------
-.IF "$(ENABLE_CAIRO)" != "TRUE"
+# --- Nothing to do if we're compiling with --disable-cairo-canvas -----------
+.IF "$(ENABLE_CAIRO_CANVAS)" != "TRUE"
 @all:
 	@echo "Building without cairo support..."
 .ELSE
 AC_ARG_WITH(system-cairo,
 [  --with-system-cairo      Use Cairo libraries already on system
 ],,)
+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,
 [  --enable-librsvg        Determines whether to use librsvg library on
                           platforms where librsvg is available.
 AC_SUBST(CAIRO_CFLAGS)
 AC_SUBST(CAIRO_LIBS)
 
+ENABLE_CAIRO_CANVAS="FALSE"
+if test "$enable_cairo_canvas" = "yes" -a "$ENABLE_CAIRO" = "TRUE" ; then
+   ENABLE_CAIRO_CANVAS="TRUE"
+fi
+AC_SUBST(ENABLE_CAIRO_CANVAS)
+
 dnl ===================================================================
 dnl Check whether the librsvg libraries are available.
 dnl ===================================================================

postprocess/packcomponents/makefile.mk

 my_components += ucpdav1
 .END
 
-.IF "$(ENABLE_CAIRO)" == "TRUE"
+.IF "$(ENABLE_CAIRO_CANVAS)" == "TRUE"
 my_components += cairocanvas
 .END
 

scp2/source/canvas/makefile.mk

 PARFILES= canvascommons.par		\
           vclcanvas.par
 
-.IF "$(ENABLE_CAIRO)" == "TRUE"
+.IF "$(ENABLE_CAIRO_CANVAS)" == "TRUE"
 PARFILES+= cairocanvas.par
 .ENDIF
 .IF "$(ENABLE_DIRECTX)" != ""

scp2/util/makefile.mk

 SCP1FILES += \
              vclcanvas.par
 
-.IF "$(ENABLE_CAIRO)" == "TRUE"
+.IF "$(ENABLE_CAIRO_CANVAS)" == "TRUE"
 SCP1FILES += cairocanvas.par
 .ENDIF
 
 ToFile( "ENABLE_STATIC_GTK", "@ENABLE_STATIC_GTK@", "e" );
 ToFile( "ENABLE_GSTREAMER",  "@ENABLE_GSTREAMER@", "e" );
 ToFile( "ENABLE_CAIRO",      "@ENABLE_CAIRO@",     "e" );
+ToFile( "ENABLE_CAIRO_CANVAS", "@ENABLE_CAIRO_CANVAS@",     "e" );
 ToFile( "ENABLE_OPENGL",     "@ENABLE_OPENGL@",    "e" );
 ToFile( "ENABLE_PDFIMPORT",  "@ENABLE_PDFIMPORT@", "e" );
 ToFile( "ENABLE_PRESENTER_EXTRA_UI","@ENABLE_PRESENTER_EXTRA_UI@","e" );

vcl/unx/generic/gdi/salgdi3.cxx

     if( !XQueryExtension( GetX11SalData()->GetDisplay()->GetDisplay(), "RENDER", &nDummy, &nDummy, &nDummy ) )
         return;
 
-#ifdef MACOSX
-    OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( "libcairo.2.dylib" ));
-#else
     OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( "libcairo.so.2" ));
-#endif    
     mpCairoLib = osl_loadModule( aLibName.pData, SAL_LOADMODULE_DEFAULT );
     if( !mpCairoLib )
         return;