From: Emil Velikov <emil.l.velikov@gmail.com>
Date: Wed, 20 Apr 2016 19:18:02 +0000 (+0100)
Subject: automake: drop "EGL_" from HAVE_EGL_PLATFORM_WAYLAND
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9f3588eb37768ae52ceacf4926c3a43d4b4306bd;p=mesa.git

automake: drop "EGL_" from HAVE_EGL_PLATFORM_WAYLAND

Analogous to previous commit.

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

diff --git a/configure.ac b/configure.ac
index 33c68cfcf4c..1c626021e9c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1991,7 +1991,7 @@ else
 fi
 
 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_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')
 AM_CONDITIONAL(HAVE_EGL_PLATFORM_NULL, echo "$egl_platforms" | grep -q 'null')
diff --git a/src/Makefile.am b/src/Makefile.am
index 9a1fddfacbc..29d4ea94ca9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -38,7 +38,7 @@ if HAVE_DRI_GLX
 SUBDIRS += glx
 endif
 
-if HAVE_EGL_PLATFORM_WAYLAND
+if HAVE_PLATFORM_WAYLAND
 SUBDIRS += egl/wayland/wayland-egl egl/wayland/wayland-drm
 endif
 
diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am
index 664282a5740..3f163bc3d2b 100644
--- a/src/egl/Makefile.am
+++ b/src/egl/Makefile.am
@@ -64,7 +64,7 @@ libEGL_la_LIBADD += $(top_builddir)/src/loader/libloader_dri3_helper.la
 endif
 endif
 
-if HAVE_EGL_PLATFORM_WAYLAND
+if HAVE_PLATFORM_WAYLAND
 AM_CFLAGS += -DHAVE_WAYLAND_PLATFORM
 AM_CFLAGS += $(WAYLAND_CFLAGS)
 libEGL_la_LIBADD += $(WAYLAND_LIBS)
diff --git a/src/gbm/Makefile.am b/src/gbm/Makefile.am
index 9a584cab352..9ec6ea032ff 100644
--- a/src/gbm/Makefile.am
+++ b/src/gbm/Makefile.am
@@ -32,7 +32,7 @@ libgbm_la_LIBADD = \
 	$(top_builddir)/src/loader/libloader.la \
 	$(DLOPEN_LIBS)
 
-if HAVE_EGL_PLATFORM_WAYLAND
+if HAVE_PLATFORM_WAYLAND
 AM_CPPFLAGS = -DHAVE_WAYLAND_PLATFORM
 AM_CFLAGS += $(WAYLAND_CFLAGS)
 libgbm_la_LIBADD += $(top_builddir)/src/egl/wayland/wayland-drm/libwayland-drm.la $(WAYLAND_LIBS)
diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am
index c1f2af6f532..91225f29164 100644
--- a/src/intel/vulkan/Makefile.am
+++ b/src/intel/vulkan/Makefile.am
@@ -97,7 +97,7 @@ VULKAN_LIB_DEPS += $(XCB_DRI3_LIBS)
 endif
 
 
-if HAVE_EGL_PLATFORM_WAYLAND
+if HAVE_PLATFORM_WAYLAND
 AM_CPPFLAGS += \
 	-I$(top_builddir)/src/egl/wayland/wayland-drm \
 	-I$(top_srcdir)/src/egl/wayland/wayland-drm \