diff options
| author | Eric Engestrom <eric.engestrom@imgtec.com> | 2018-01-26 15:15:29 +0000 |
|---|---|---|
| committer | Eric Engestrom <eric.engestrom@imgtec.com> | 2018-01-29 15:41:52 +0000 |
| commit | d2b0a4ec70d93040159af0cbc15717d35812ffc5 (patch) | |
| tree | 13a75d116b795d00dfb57c95248ed7768c145cb2 | |
| parent | ec53f4808c8ccd73cd2dbed8b53a4e961e3a2b76 (diff) | |
always define HAVE_CAIRO
Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | meson.build | 4 | ||||
| -rw-r--r-- | tests/util/pattern.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index e19fdc99..993c2a27 100644 --- a/configure.ac +++ b/configure.ac @@ -466,6 +466,8 @@ if test "x$CAIRO" = xyes; then AC_MSG_ERROR([Cairo support required but not present]) fi AC_DEFINE(HAVE_CAIRO, 1, [Have Cairo support]) +else + AC_DEFINE(HAVE_CAIRO, 0) fi AC_MSG_RESULT([$CAIRO]) AM_CONDITIONAL(HAVE_CAIRO, [test "x$CAIRO" = xyes]) diff --git a/meson.build b/meson.build index c7245dda..15a1d405 100644 --- a/meson.build +++ b/meson.build @@ -256,15 +256,13 @@ foreach t : [[with_intel, 'INTEL'], [with_vmwgfx, 'VMWGFX'], [with_exynos, 'EXYNOS'], [with_vc4, 'VC4'], [with_freedreno_kgsl, 'FREEDRENO_KGSL'], + [dep_cairo.found(), 'CAIRO'], [with_radeon, 'RADEON']] config.set10('HAVE_@0@'.format(t[1]), t[0]) endforeach if with_freedreno_kgsl and not with_freedreno error('cannot enable freedreno-kgsl without freedreno support') endif -if dep_cairo.found() - config.set10('HAVE_CAIRO', true) -endif if dep_valgrind.found() config.set10('HAVE_VALGRIND', true) endif diff --git a/tests/util/pattern.c b/tests/util/pattern.c index 2366b006..75a458d4 100644 --- a/tests/util/pattern.c +++ b/tests/util/pattern.c @@ -34,7 +34,7 @@ #include <drm_fourcc.h> -#ifdef HAVE_CAIRO +#if HAVE_CAIRO #include <cairo.h> #include <math.h> #endif @@ -546,7 +546,7 @@ static void fill_smpte(const struct util_format_info *info, void *planes[3], static void make_pwetty(void *data, unsigned int width, unsigned int height, unsigned int stride, uint32_t format) { -#ifdef HAVE_CAIRO +#if HAVE_CAIRO cairo_surface_t *surface; cairo_t *cr; cairo_format_t cairo_format; |