[Mesa-dev] [PATCH 17/25] automake: drop "EGL_" from HAVE_EGL_PLATFORM_X11

[Emil Velikov]

The variable covers more than just EGL, let's try to untangle the
confusion it brings.

Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
---
 configure.ac                 | 2 +-
 src/egl/Makefile.am          | 2 +-
 src/intel/vulkan/Makefile.am | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 2407e54..ddd4fe1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1978,7 +1978,7 @@ else
     EGL_NATIVE_PLATFORM="_EGL_INVALID_PLATFORM"
 fi
 
-AM_CONDITIONAL(HAVE_EGL_PLATFORM_X11, echo "$egl_platforms" | grep -q 'x11')
+AM_CONDITIONAL(HAVE_PLATFORM_X11, echo "$egl_platforms" | grep -q 'x11')
 AM_CONDITIONAL(HAVE_EGL_PLATFORM_WAYLAND, echo "$egl_platforms" | grep -q 'wayland')
 AM_CONDITIONAL(HAVE_EGL_PLATFORM_DRM, echo "$egl_platforms" | grep -q 'drm')
 AM_CONDITIONAL(HAVE_EGL_PLATFORM_SURFACELESS, echo "$egl_platforms" | grep -q 'surfaceless')
diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am
index 6953d44..664282a 100644
--- a/src/egl/Makefile.am
+++ b/src/egl/Makefile.am
@@ -49,7 +49,7 @@ libEGL_la_LDFLAGS = \
 dri2_backend_FILES =
 dri3_backend_FILES =
 
-if HAVE_EGL_PLATFORM_X11
+if HAVE_PLATFORM_X11
 AM_CFLAGS += -DHAVE_X11_PLATFORM
 AM_CFLAGS += $(XCB_DRI2_CFLAGS)
 libEGL_la_LIBADD += $(XCB_DRI2_LIBS)
diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am
index 39ef9e2..4d12a5b 100644
--- a/src/intel/vulkan/Makefile.am
+++ b/src/intel/vulkan/Makefile.am
@@ -87,7 +87,7 @@ libanv_gen9_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=90
 libanv_gen9_la_SOURCES = $(GEN9_FILES)
 
 
-if HAVE_EGL_PLATFORM_X11
+if HAVE_PLATFORM_X11
 AM_CPPFLAGS += \
 	$(XCB_DRI3_CFLAGS) \
 	-DVK_USE_PLATFORM_XCB_KHR
-- 
2.8.0