From 4a051e98dc2d148bd563cbce65cb56d9a193dd1c Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Mon, 5 Jun 2017 10:34:26 +0200 Subject: [PATCH] Host: dlopen libX11.so.6 instead of libX11.so Symlink libX11.so does not need to be present in system. However, libX11.so.6 is very common (currently only?) SONAME. --- src/host.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/host.cpp b/src/host.cpp index 10cadf821..bba04f6b0 100644 --- a/src/host.cpp +++ b/src/host.cpp @@ -28,6 +28,9 @@ #ifdef HAVE_X #include #include +/// @todo +/// The actual SONAME should be actually figured in configure. +#define X11_LIB_NAME "libX11.so.6" #endif #ifdef USE_MTRACE @@ -124,7 +127,7 @@ bool common_preinit(int argc, char *argv[]) uv_argv = argv; #ifdef HAVE_X - void *handle = dlopen("libX11.so", RTLD_NOW); + void *handle = dlopen(X11_LIB_NAME, RTLD_NOW); if (handle) { Status (*XInitThreadsProc)(); @@ -149,7 +152,7 @@ bool common_preinit(int argc, char *argv[]) dlclose(handle); } else { - log_msg(LOG_LEVEL_WARNING, "Unable open X11 library: %s\n", dlerror()); + log_msg(LOG_LEVEL_WARNING, "Unable open " X11_LIB_NAME " library: %s\n", dlerror()); } #endif