Signed-off-by: Eric Engestrom <[email protected]>
---
configure.ac | 2 ++
meson.build | 4 +---
tests/util/pattern.c | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index a745d694a3bb2e8b9761..4ebebb4feb8073771ef9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -470,6 +470,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 b7dbe07949b3957e2523..31a7990bb3ee140c4de1 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 2366b00613a7f1c63cde..75a458d4b7ce78204991 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;
--
Cheers,
Eric
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
