diff options
| -rw-r--r-- | configure.ac | 14 | ||||
| -rw-r--r-- | src/egl/Makefile.am | 2 |
2 files changed, 3 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac index ec280328b0b..e162f9b003c 100644 --- a/configure.ac +++ b/configure.ac @@ -2012,14 +2012,8 @@ if test "x$enable_egl" = xyes; then fi if test "x$enable_dri" = xyes; then - HAVE_EGL_DRIVER_DRI2=1 if test "x$enable_shared_glapi" = xno; then - AC_MSG_ERROR([egl_dri2 requires --enable-shared-glapi]) - fi - if test "x$enable_dri3" = xyes; then - HAVE_EGL_DRIVER_DRI3=1 - if test "x$enable_shared_glapi" = xno; then - AC_MSG_ERROR([egl_dri3 requires --enable-shared-glapi]) + AC_MSG_ERROR([egl_dri requires --enable-shared-glapi]) fi else # Avoid building an "empty" libEGL. Drop/update this @@ -2299,8 +2293,6 @@ 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_EGL_DRIVER_DRI2, test "x$HAVE_EGL_DRIVER_DRI2" != "x") - AC_SUBST([EGL_NATIVE_PLATFORM]) AC_SUBST([EGL_CFLAGS]) @@ -2941,10 +2933,10 @@ if test "$enable_egl" = yes; then echo " EGL platforms: $egl_platforms" egl_drivers="" - if test "x$HAVE_EGL_DRIVER_DRI2" != "x"; then + if test "x$enable_dri" != "xno"; then egl_drivers="$egl_drivers builtin:egl_dri2" fi - if test "x$HAVE_EGL_DRIVER_DRI3" != "x"; then + if test "x$enable_dri3" != "xno"; then egl_drivers="$egl_drivers builtin:egl_dri3" fi diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am index 7c5abd21148..78cf525951d 100644 --- a/src/egl/Makefile.am +++ b/src/egl/Makefile.am @@ -91,7 +91,6 @@ libEGL_la_LIBADD += $(ANDROID_LIBS) dri2_backend_FILES += drivers/dri2/platform_android.c endif -if HAVE_EGL_DRIVER_DRI2 AM_CFLAGS += \ -I$(top_srcdir)/src/loader \ -I$(top_srcdir)/src/egl/drivers/dri2 \ @@ -109,7 +108,6 @@ libEGL_la_SOURCES += \ libEGL_la_LIBADD += $(top_builddir)/src/loader/libloader.la libEGL_la_LIBADD += $(DLOPEN_LIBS) $(LIBDRM_LIBS) $(CLOCK_LIB) -endif include $(top_srcdir)/install-lib-links.mk |