diff options
| author | Emil Velikov <[email protected]> | 2016-04-20 20:17:53 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2016-05-01 08:38:05 +0100 |
| commit | 5459db91e31d8986d55e4cf3c86dc0c76ab0249a (patch) | |
| tree | 5ce2e89358aeb312df4dc300160322064c1026d5 | |
| parent | a56009d0895fe09050edc1b3dd014bda5e965443 (diff) | |
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 <[email protected]>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/egl/Makefile.am | 2 | ||||
| -rw-r--r-- | src/intel/vulkan/Makefile.am | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 0641b767ee6..33c68cfcf4c 100644 --- 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 6953d44e607..664282a5740 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 bee8f5be0c9..c1f2af6f532 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 |