Skip to content

Commit

Permalink
try to honour LD_LIBRARY_PATH, still adding hard-coded /usr/lib[64] s…
Browse files Browse the repository at this point in the history
…ince I don't know where to look that up..

git-svn-id: https://xpra.org/svn/Xpra/trunk@5325 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Feb 1, 2014
1 parent e045428 commit 1f5275d
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions src/xpra/scripts/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -544,8 +544,11 @@ def start_children(child_reaper, commands, fake_xinerama):
#it would be better to rely on dlopen to find the paths
#but I cannot find a way of getting ctypes to tell us the path
#it found the library in
for libpath in ["/usr/lib64", "/usr/lib", "/usr/local/lib64", "/usr/local/lib"]:
if not os.path.exists(libpath):
libpaths = os.environ.get("LD_LIBRARY_PATH", "").split(":")
libpaths.append("/usr/lib64")
libpaths.append("/usr/lib")
for libpath in libpaths:
if not libpath or not os.path.exists(libpath):
continue
libfakeXinerama_so = "%s/%s" % (libpath, "libfakeXinerama.so.1")
if os.path.exists(libfakeXinerama_so):
Expand Down

0 comments on commit 1f5275d

Please sign in to comment.