[Mesa-stable] [PATCH v2 02/27] configure: rename remaining HAVE_EGL_PLATFORM_* guards

Emil Velikov emil.l.velikov at gmail.com
Thu May 4 16:29:47 UTC 2017


From: Emil Velikov <emil.velikov at collabora.com>

Analogous to others earlier, these will be used to control the platform
for more than the EGL driver.

Cc: <mesa-stable at lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
---
 configure.ac        | 6 +++---
 src/egl/Makefile.am | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index a7b1cee43d1..6fb662c13b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1726,9 +1726,9 @@ done
 
 AM_CONDITIONAL(HAVE_PLATFORM_X11, echo "$egl_platforms" | grep -q 'x11')
 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_ANDROID, echo "$egl_platforms" | grep -q 'android')
+AM_CONDITIONAL(HAVE_PLATFORM_DRM, echo "$egl_platforms" | grep -q 'drm')
+AM_CONDITIONAL(HAVE_PLATFORM_SURFACELESS, echo "$egl_platforms" | grep -q 'surfaceless')
+AM_CONDITIONAL(HAVE_PLATFORM_ANDROID, echo "$egl_platforms" | grep -q 'android')
 
 dnl
 dnl More DRI setup
diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am
index e607b83fb99..45f273e2884 100644
--- a/src/egl/Makefile.am
+++ b/src/egl/Makefile.am
@@ -70,18 +70,18 @@ libEGL_common_la_LIBADD += $(top_builddir)/src/egl/wayland/wayland-drm/libwaylan
 dri2_backend_FILES += drivers/dri2/platform_wayland.c
 endif
 
-if HAVE_EGL_PLATFORM_DRM
+if HAVE_PLATFORM_DRM
 AM_CFLAGS += -DHAVE_DRM_PLATFORM
 libEGL_common_la_LIBADD += $(top_builddir)/src/gbm/libgbm.la
 dri2_backend_FILES += drivers/dri2/platform_drm.c
 endif
 
-if HAVE_EGL_PLATFORM_SURFACELESS
+if HAVE_PLATFORM_SURFACELESS
 AM_CFLAGS += -DHAVE_SURFACELESS_PLATFORM
 dri2_backend_FILES += drivers/dri2/platform_surfaceless.c
 endif
 
-if HAVE_EGL_PLATFORM_ANDROID
+if HAVE_PLATFORM_ANDROID
 AM_CFLAGS += -DHAVE_ANDROID_PLATFORM
 AM_CFLAGS += $(ANDROID_CFLAGS)
 libEGL_common_la_LIBADD += $(ANDROID_LIBS)
-- 
2.12.2



More information about the mesa-stable mailing list