From fcae4dc85f0295e00796501054bab6e4c39fd718 Mon Sep 17 00:00:00 2001
From: Bastian Wissler
Date: Thu, 16 Oct 2008 19:06:03 +0000
Subject: xserver: linked default mesa libs back, when needed (stage3)

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2349 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 os-plugins/plugins/xserver/XX_xserver.sh | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'os-plugins/plugins/xserver')

diff --git a/os-plugins/plugins/xserver/XX_xserver.sh b/os-plugins/plugins/xserver/XX_xserver.sh
index 72b7faac..93d74d30 100644
--- a/os-plugins/plugins/xserver/XX_xserver.sh
+++ b/os-plugins/plugins/xserver/XX_xserver.sh
@@ -128,6 +128,18 @@ ${PLUGIN_ROOTFS}/usr/X11R6/lib/modules/\,"
       ln -s ${PLUGIN_ROOTFS}/usr/lib/libGL.so.1 \
       ${LINK_PATH}libGL.so.1.2
     fi
+
+    # link to default mesa libraries if no binary drivers are to be installed
+    if [ "${xmodule}" != "nvidia" -o "${xmodule}" != "fglrx" ]; then
+      if [ -e /usr/lib/libGL.so.1.2 ]; then
+       ln -sf /usr/lib/libGL.so.1.2 /var/X11R6/lib/libGL.so
+       ln -sf /usr/lib/libGL.so.1.2 /var/X11R6/lib/libGL.so.1
+      fi
+      if [ -e /usr/lib/libGL_MESA.1.2 ]; then
+       ln -sf /usr/lib/libGL_MESA.so.1.2 /var/X11R6/lib/libGL.so
+       ln -sf /usr/lib/libGL_MESA.so.1.2 /var/X11R6/lib/libGL.so.1
+      fi
+    fi
     set +x
     ######################################################################
     # end proprietary drivers section
-- 
cgit v1.2.3-55-g7522