Mesa (master): glx: Remove an old DEFAULT_DRIVER_DIR default.

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 7076e9f116c2060a7f28680178d96c188c7177df
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7076e9f116c2060a7f28680178d96c188c7177df

Author: Eric Anholt <eric at anholt.net>
Date:   Thu Nov 15 13:41:34 2018 -0800

glx: Remove an old DEFAULT_DRIVER_DIR default.

You can tell by "Mesa/configs/default" how old this is.  Your build system
really has to provide the DEFAULT_DRIVER_DIR, or other loaders will break.

v2: Move the bad (non-prefix-dependent) define to the SConscript to avoid
    breaking it.

Reviewed-by: Eric Engestrom <eric.engestrom at intel.com> (v1)
Reviewed-by: Emil Velikov <emil.velikov at collabora.com> (v1)

---

 src/glx/SConscript   | 3 ++-
 src/glx/dri_common.c | 5 -----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/glx/SConscript b/src/glx/SConscript
index 8ce1771581..83c62e22f8 100644
--- a/src/glx/SConscript
+++ b/src/glx/SConscript
@@ -24,9 +24,10 @@ env.Prepend(CPPPATH = [
 
 env.Append(CPPDEFINES = [
     '_REENTRANT',
-    #('DEFAULT_DRIVER_DIR', 'DRI_DRIVER_SEARCH_DIR')
 ])
 
+env.Append(CPPDEFINES = ['DEFAULT_DRIVER_DIR=\\"/usr/local/lib/dri\\"'])
+
 env.Prepend(LIBS = [
     libloader,
     mesautil,
diff --git a/src/glx/dri_common.c b/src/glx/dri_common.c
index ab5d6c5bc0..08923d7efd 100644
--- a/src/glx/dri_common.c
+++ b/src/glx/dri_common.c
@@ -77,11 +77,6 @@ dri_message(int level, const char *f, ...)
 #define GL_LIB_NAME "libGL.so.1"
 #endif
 
-#ifndef DEFAULT_DRIVER_DIR
-/* this is normally defined in Mesa/configs/default with DRI_DRIVER_SEARCH_PATH */
-#define DEFAULT_DRIVER_DIR "/usr/local/lib/dri"
-#endif
-
 /**
  * Try to \c dlopen the named driver.
  *