meson,configure: always define HAVE_{INTEL,VMWGFX,NOUVEAU,EXYNOS,VC4,RADEON}

Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>

3 files changed, 20 insertions, 8 deletions

diff --git a/configure.ac b/configure.ac
index 6bb8d9f5..32ceba69 100644
--- a/configure.ac
+++ b/configure.ac
@@ -358,16 +358,22 @@ AM_CONDITIONAL(HAVE_LIBKMS, [test "x$LIBKMS" = xyes])
 AM_CONDITIONAL(HAVE_INTEL, [test "x$INTEL" = xyes])
 if test "x$INTEL" = xyes; then
         AC_DEFINE(HAVE_INTEL, 1, [Have intel support])
+else
+        AC_DEFINE(HAVE_INTEL, 0)
 fi
 
 AM_CONDITIONAL(HAVE_VMWGFX, [test "x$VMWGFX" = xyes])
 if test "x$VMWGFX" = xyes; then
         AC_DEFINE(HAVE_VMWGFX, 1, [Have vmwgfx kernel headers])
+else
+        AC_DEFINE(HAVE_VMWGFX, 0)
 fi
 
 AM_CONDITIONAL(HAVE_NOUVEAU, [test "x$NOUVEAU" = xyes])
 if test "x$NOUVEAU" = xyes; then
         AC_DEFINE(HAVE_NOUVEAU, 1, [Have nouveau (nvidia) support])
+else
+        AC_DEFINE(HAVE_NOUVEAU, 0)
 fi
 
 AM_CONDITIONAL(HAVE_OMAP, [test "x$OMAP" = xyes])
@@ -375,6 +381,8 @@ AM_CONDITIONAL(HAVE_OMAP, [test "x$OMAP" = xyes])
 AM_CONDITIONAL(HAVE_EXYNOS, [test "x$EXYNOS" = xyes])
 if test "x$EXYNOS" = xyes; then
         AC_DEFINE(HAVE_EXYNOS, 1, [Have EXYNOS support])
+else
+        AC_DEFINE(HAVE_EXYNOS, 0)
 fi
 
 AM_CONDITIONAL(HAVE_FREEDRENO, [test "x$FREEDRENO" = xyes])
@@ -392,6 +400,8 @@ fi
 AM_CONDITIONAL(HAVE_RADEON, [test "x$RADEON" = xyes])
 if test "x$RADEON" = xyes; then
         AC_DEFINE(HAVE_RADEON, 1, [Have radeon support])
+else
+        AC_DEFINE(HAVE_RADEON, 0)
 fi
 
 if test "x$AMDGPU" != xno; then
@@ -421,6 +431,8 @@ if test "x$AMDGPU" = xyes; then
         if test "x$have_cunit" = "xno"; then
                 AC_MSG_WARN([Could not find cunit library. Disabling amdgpu tests])
         fi
+else
+        AC_DEFINE(HAVE_AMDGPU, 0)
 fi
 
 AM_CONDITIONAL(HAVE_TEGRA, [test "x$TEGRA" = xyes])
@@ -428,6 +440,8 @@ AM_CONDITIONAL(HAVE_TEGRA, [test "x$TEGRA" = xyes])
 AM_CONDITIONAL(HAVE_VC4, [test "x$VC4" = xyes])
 if test "x$VC4" = xyes; then
         AC_DEFINE(HAVE_VC4, 1, [Have VC4 support])
+else
+        AC_DEFINE(HAVE_VC4, 0)
 fi
 
 AM_CONDITIONAL(HAVE_ETNAVIV, [test "x$ETNAVIV" = xyes])
diff --git a/libkms/linux.c b/libkms/linux.c
index 0b50777e..1431eb10 100644
--- a/libkms/linux.c
+++ b/libkms/linux.c
@@ -110,27 +110,27 @@ linux_from_sysfs(int fd, struct kms_driver **out)
         if (ret)
                 return ret;
 
-#ifdef HAVE_INTEL
+#if HAVE_INTEL
         if (!strcmp(name, "intel"))
                 ret = intel_create(fd, out);
         else
 #endif
-#ifdef HAVE_VMWGFX
+#if HAVE_VMWGFX
         if (!strcmp(name, "vmwgfx"))
                 ret = vmwgfx_create(fd, out);
         else
 #endif
-#ifdef HAVE_NOUVEAU
+#if HAVE_NOUVEAU
         if (!strcmp(name, "nouveau"))
                 ret = nouveau_create(fd, out);
         else
 #endif
-#ifdef HAVE_RADEON
+#if HAVE_RADEON
         if (!strcmp(name, "radeon"))
                 ret = radeon_create(fd, out);
         else
 #endif
-#ifdef HAVE_EXYNOS
+#if HAVE_EXYNOS
         if (!strcmp(name, "exynos"))
                 ret = exynos_create(fd, out);
         else
diff --git a/meson.build b/meson.build
index fa00254b..7298f741 100644
--- a/meson.build
+++ b/meson.build
@@ -256,9 +256,7 @@ foreach t : [[with_intel, 'INTEL'], [with_vmwgfx, 'VMWGFX'],
              [with_exynos, 'EXYNOS'],
              [with_vc4, 'VC4'],
              [with_radeon, 'RADEON']]
-  if t[0]
-    config.set10('HAVE_@0@'.format(t[1]), true)
-  endif
+  config.set10('HAVE_@0@'.format(t[1]), t[0])
 endforeach
 if with_freedreno_kgsl
   if not with_freedreno