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>

diff --git a/configure.ac b/configure.ac
index dae632099310d025d53d1cd0a7eabe5fd1041114..bf9059df9b0531b10d37810aba4162fd5342679d 100644 (file)
--- 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 6746bcc95ebfe6256deb003ff48aa2a79533a8a6..df8bf282cc0ba0d3f744fcbe3128fe4d602e23cd 100644 (file)
--- 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 7e6de811013a858a799ea66569b5d13ff1274cc3..3f0e650e2709cd5e982f5c11c337071faff634b5 100644 (file)
--- 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