diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-04-24 10:41:59 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-04-24 12:23:00 +0300 |
| commit | 7e1516124bb05f9f40e1d724688b7b1a80327dfe (patch) | |
| tree | 8fd12ba54905687d269e7f13e7c7bdfecb5d5512 /configure.in | |
| parent | 0d0b7947aa7c7e9b1dafee8b99211b43f2ca1668 (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.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 13 |
1 files changed, 11 insertions, 2 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) |