aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.ac2
-rw-r--r--meson.build4
-rw-r--r--tests/util/pattern.c4
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
466 AC_MSG_ERROR([Cairo support required but not present]) 466 AC_MSG_ERROR([Cairo support required but not present])
467 fi 467 fi
468 AC_DEFINE(HAVE_CAIRO, 1, [Have Cairo support]) 468 AC_DEFINE(HAVE_CAIRO, 1, [Have Cairo support])
469else
470 AC_DEFINE(HAVE_CAIRO, 0)
469fi 471fi
470AC_MSG_RESULT([$CAIRO]) 472AC_MSG_RESULT([$CAIRO])
471AM_CONDITIONAL(HAVE_CAIRO, [test "x$CAIRO" = xyes]) 473AM_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'],
256 [with_exynos, 'EXYNOS'], 256 [with_exynos, 'EXYNOS'],
257 [with_vc4, 'VC4'], 257 [with_vc4, 'VC4'],
258 [with_freedreno_kgsl, 'FREEDRENO_KGSL'], 258 [with_freedreno_kgsl, 'FREEDRENO_KGSL'],
259 [dep_cairo.found(), 'CAIRO'],
259 [with_radeon, 'RADEON']] 260 [with_radeon, 'RADEON']]
260 config.set10('HAVE_@0@'.format(t[1]), t[0]) 261 config.set10('HAVE_@0@'.format(t[1]), t[0])
261endforeach 262endforeach
262if with_freedreno_kgsl and not with_freedreno 263if with_freedreno_kgsl and not with_freedreno
263 error('cannot enable freedreno-kgsl without freedreno support') 264 error('cannot enable freedreno-kgsl without freedreno support')
264endif 265endif
265if dep_cairo.found()
266 config.set10('HAVE_CAIRO', true)
267endif
268if dep_valgrind.found() 266if dep_valgrind.found()
269 config.set10('HAVE_VALGRIND', true) 267 config.set10('HAVE_VALGRIND', true)
270endif 268endif
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 @@
34 34
35#include <drm_fourcc.h> 35#include <drm_fourcc.h>
36 36
37#ifdef HAVE_CAIRO 37#if HAVE_CAIRO
38#include <cairo.h> 38#include <cairo.h>
39#include <math.h> 39#include <math.h>
40#endif 40#endif
@@ -546,7 +546,7 @@ static void fill_smpte(const struct util_format_info *info, void *planes[3],
546static void make_pwetty(void *data, unsigned int width, unsigned int height, 546static void make_pwetty(void *data, unsigned int width, unsigned int height,
547 unsigned int stride, uint32_t format) 547 unsigned int stride, uint32_t format)
548{ 548{
549#ifdef HAVE_CAIRO 549#if HAVE_CAIRO
550 cairo_surface_t *surface; 550 cairo_surface_t *surface;
551 cairo_t *cr; 551 cairo_t *cr;
552 cairo_format_t cairo_format; 552 cairo_format_t cairo_format;