diff options
| author | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-04-12 20:37:07 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-17 13:51:41 +0200 |
| commit | 54c611fa455fd5e9e8fc711c158085924f47d590 (patch) | |
| tree | d46e16e84f524ba4401e0046338f97d6080e9874 | |
| parent | 44f359776cc8852b12b1e0be9a7ad71d74c63685 (diff) | |
ooo340fixes: #i117804# differentiate between ENABLE_CAIRO and ENABLE_CAIRO_CANVAS [hg:e09be3339384]
| -rw-r--r-- | configure.in | 10 | ||||
| -rw-r--r-- | scp2/source/canvas/makefile.mk | 2 | ||||
| -rw-r--r-- | scp2/util/makefile.mk | 2 | ||||
| -rw-r--r-- | set_soenv.in | 1 |
4 files changed, 13 insertions, 2 deletions
diff --git a/configure.in b/configure.in index 641d51141fd0..34af2af72703 100644 --- a/configure.in +++ b/configure.in @@ -209,6 +209,10 @@ AC_ARG_ENABLE(cairo, 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. @@ -5783,6 +5787,12 @@ AC_SUBST(SYSTEM_CAIRO) 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 =================================================================== diff --git a/scp2/source/canvas/makefile.mk b/scp2/source/canvas/makefile.mk index f89e1c685b08..eaffb93f3e0f 100644 --- a/scp2/source/canvas/makefile.mk +++ b/scp2/source/canvas/makefile.mk @@ -49,7 +49,7 @@ SCPDEFS+=-DSYSTEM_AGG PARFILES= canvascommons.par \ vclcanvas.par -.IF "$(ENABLE_CAIRO)" == "TRUE" +.IF "$(ENABLE_CAIRO_CANVAS)" == "TRUE" PARFILES+= cairocanvas.par .ENDIF .IF "$(ENABLE_DIRECTX)" != "" diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk index 1fed891823b6..c03942844c88 100644 --- a/scp2/util/makefile.mk +++ b/scp2/util/makefile.mk @@ -178,7 +178,7 @@ SCP1FILES += \ SCP1FILES += \ vclcanvas.par -.IF "$(ENABLE_CAIRO)" == "TRUE" +.IF "$(ENABLE_CAIRO_CANVAS)" == "TRUE" SCP1FILES += cairocanvas.par .ENDIF diff --git a/set_soenv.in b/set_soenv.in index 6a8c65baa246..c12421a8c662 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -1634,6 +1634,7 @@ ToFile( "ENABLE_SYSTRAY_GTK", "@ENABLE_SYSTRAY_GTK@", "e" ); 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" ); |