Merge remote branch 'origin/7.8'

[mesa.git] / src / glut / glx / SConscript

diff --git a/src/glut/glx/SConscript b/src/glut/glx/SConscript
index 5234e6d58ac2f4deb6625a5d5a1108b7baf351c9..29d2cc01494841b0dd68909febe3aa626be01134 100644 (file)
--- a/src/glut/glx/SConscript
+++ b/src/glut/glx/SConscript
@@ -78,6 +78,7 @@ if env['platform'] == 'windows':
         'glut.def',
     ]
 else:
+    env.Tool('x11')
     env.PrependUnique(LIBS = [
         'GLU',
         'GL',
@@ -105,5 +106,7 @@ env.InstallSharedLibrary(glut, version=(3, 7, 1))
 
 if env['platform'] == 'windows':
     glut = env.FindIxes(glut, 'LIBPREFIX', 'LIBSUFFIX')
+else:
+    glut = env.FindIxes(glut, 'SHLIBPREFIX', 'SHLIBSUFFIX')
 
 Export('glut')