diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2014-09-22 18:32:03 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2014-09-27 15:20:14 +0100 |
| commit | 407450eb84f5a1b466a2eff19b85cdee7ac15dfb (patch) | |
| tree | cb8ea78aa9c09e2611f0ea42b27abe0991e35108 | |
| parent | 2e6fc0647a93f7091068d1a75ba5948b9bff5da3 (diff) | |
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 <emil.l.velikov@gmail.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | src/egl/main/Makefile.am | 2 | ||||
| -rw-r--r-- | src/gallium/targets/egl-static/Makefile.am | 2 |
3 files changed, 2 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index dae6320993..bf9059df9b 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 6746bcc95e..df8bf282cc 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 7e6de81101..3f0e650e27 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 |