From: Emil Velikov Date: Fri, 25 Nov 2016 17:11:51 +0000 (+0000) Subject: configure: rename remaining HAVE_EGL_PLATFORM_* guards X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=27737e7e84ea1fc9afb44d9294bcf9896f876cfc;p=mesa.git configure: rename remaining HAVE_EGL_PLATFORM_* guards Analogous to others earlier, these will be used to control the platform for more than the EGL driver. Cc: Signed-off-by: Emil Velikov Reviewed-by: Eric Engestrom --- diff --git a/configure.ac b/configure.ac index e799c9815f5..798aaeb2e90 100644 --- a/configure.ac +++ b/configure.ac @@ -1721,9 +1721,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 5e034fba0e2..1fb568f6cf8 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)