diff options
| author | Kyle Brenneman <kbrenneman@nvidia.com> | 2015-09-28 12:12:05 -0600 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2015-10-02 13:25:05 +0100 |
| commit | d35391cfda13afdb19a47003af260e258575ef45 (patch) | |
| tree | 4993d6496258da265de24564bf776283cfd33539 /src/glx | |
| parent | 798f260a2f553e339d7f5fc5120bb627893dc740 (diff) | |
| download | external_mesa3d-d35391cfda13afdb19a47003af260e258575ef45.zip external_mesa3d-d35391cfda13afdb19a47003af260e258575ef45.tar.gz external_mesa3d-d35391cfda13afdb19a47003af260e258575ef45.tar.bz2 | |
glx: Don't hard-code the name "libGL.so.1" in driOpenDriver (v3)
Add a macro GL_LIB_NAME to hold the filename that configure comes up with
based on the --with-gl-lib-name and --enable-mangling options.
In driOpenDriver, use the GL_LIB_NAME macro instead of hard-coding
"libGL.so.1".
v2: Add an #ifndef/#define for GL_LIB_NAME so that non-autoconf builds will
work.
v3: Fix the library filename in the Makefile.
Signed-off-by: Kyle Brenneman <kbrenneman@nvidia.com>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Cc: "10.6 11.0" <mesa-stable@lists.freedesktop.org>
Diffstat (limited to 'src/glx')
| -rw-r--r-- | src/glx/Makefile.am | 1 | ||||
| -rw-r--r-- | src/glx/dri_common.c | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am index 6e50e09..e64955e 100644 --- a/src/glx/Makefile.am +++ b/src/glx/Makefile.am @@ -46,6 +46,7 @@ AM_CFLAGS = \ $(EXTRA_DEFINES_XF86VIDMODE) \ -D_REENTRANT \ -DDEFAULT_DRIVER_DIR=\"$(DRI_DRIVER_SEARCH_DIR)\" \ + -DGL_LIB_NAME=\"lib@GL_LIB@.so.1\" \ $(DEFINES) \ $(LIBDRM_CFLAGS) \ $(DRI2PROTO_CFLAGS) \ diff --git a/src/glx/dri_common.c b/src/glx/dri_common.c index eedcd46..8a56385 100644 --- a/src/glx/dri_common.c +++ b/src/glx/dri_common.c @@ -73,6 +73,10 @@ dri_message(int level, const char *f, ...) } } +#ifndef GL_LIB_NAME +#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" @@ -99,7 +103,7 @@ driOpenDriver(const char *driverName) int len; /* Attempt to make sure libGL symbols will be visible to the driver */ - glhandle = dlopen("libGL.so.1", RTLD_NOW | RTLD_GLOBAL); + glhandle = dlopen(GL_LIB_NAME, RTLD_NOW | RTLD_GLOBAL); libPaths = NULL; if (geteuid() == getuid()) { |