Module: Mesa Branch: master Commit: 407450eb84f5a1b466a2eff19b85cdee7ac15dfb URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=407450eb84f5a1b466a2eff19b85cdee7ac15dfb
Author: Emil Velikov <[email protected]> Date: Mon Sep 22 18:32:03 2014 +0100 configure: drop --with-egl-driver-dir switch The location of the egl driver(s) is matter that we should have never exposed to the user. Currently the dri2 driver is built into the libEGL loader, with the gallium based one soon to follow. v2: Fold EGL_DRIVER_INSTALL_DIR within the makefiles. Suggested by Matt. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=80615 Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Matt Turner <[email protected]> --- configure.ac | 7 ------- src/egl/main/Makefile.am | 2 +- src/gallium/targets/egl-static/Makefile.am | 2 +- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index dae6320..bf9059d 100644 --- a/configure.ac +++ b/configure.ac @@ -1594,13 +1594,6 @@ if ! echo "$egl_platforms" | grep -q 'x11'; then GL_PC_CFLAGS="$GL_PC_CFLAGS -DMESA_EGL_NO_X11_HEADERS" fi -AC_ARG_WITH([egl-driver-dir], - [AS_HELP_STRING([--with-egl-driver-dir=DIR], - [directory for EGL drivers @<:@default=${libdir}/egl@:>@])], - [EGL_DRIVER_INSTALL_DIR="$withval"], - [EGL_DRIVER_INSTALL_DIR='${libdir}/egl']) -AC_SUBST([EGL_DRIVER_INSTALL_DIR]) - AC_ARG_WITH([max-width], [AS_HELP_STRING([--with-max-width=N], [Maximum framebuffer width (4096)])], diff --git a/src/egl/main/Makefile.am b/src/egl/main/Makefile.am index 6746bcc..df8bf28 100644 --- a/src/egl/main/Makefile.am +++ b/src/egl/main/Makefile.am @@ -28,7 +28,7 @@ AM_CFLAGS = \ $(VISIBILITY_CFLAGS) \ $(EGL_CFLAGS) \ -D_EGL_NATIVE_PLATFORM=$(EGL_NATIVE_PLATFORM) \ - -D_EGL_DRIVER_SEARCH_DIR=\"$(EGL_DRIVER_INSTALL_DIR)\" \ + -D_EGL_DRIVER_SEARCH_DIR=\"$(libdir)/egl\" \ -D_EGL_OS_UNIX=1 lib_LTLIBRARIES = libEGL.la diff --git a/src/gallium/targets/egl-static/Makefile.am b/src/gallium/targets/egl-static/Makefile.am index 7e6de81..3f0e650 100644 --- a/src/gallium/targets/egl-static/Makefile.am +++ b/src/gallium/targets/egl-static/Makefile.am @@ -52,7 +52,7 @@ AM_LDFLAGS += \ -Wl,--version-script=$(top_srcdir)/src/gallium/targets/egl-static/egl.sym endif -egldir = $(EGL_DRIVER_INSTALL_DIR) +egldir = $(libdir)/egl egl_LTLIBRARIES = egl_gallium.la nodist_EXTRA_egl_gallium_la_SOURCES = dummy.cpp _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
