automake: drop "EGL_" from HAVE_EGL_PLATFORM_X11

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

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>

diff --git a/configure.ac b/configure.ac
index 0641b767ee6524f406fd0ce8e4bc8ff347e213b5..33c68cfcf4cda8813251445d8698cff1b7748b65 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1990,7 +1990,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 6953d44e6071c2a016fd34f2926513fe00edbd31..664282a5740e96d9e0bcfcaed2d3702e2017a6e0 100644 (file)
--- 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 bee8f5be0c99936c32cd29b6d02171a29aec468c..c1f2af6f532fd837ac1113ef06485c26c9f6e2ad 100644 (file)
--- 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