--- alx-src/branches/alxconf_20060908/functions/config_x11.sh 2010/11/23 12:32:07 1585 +++ alx-src/branches/alxconf_20060908/functions/config_x11.sh 2010/11/26 09:32:30 1586 @@ -39,6 +39,7 @@ local xfconfig local HAS_VNC local HAS_REALVNC + local HAS_TIGERVNC # xfree or xorg ? xserver="$(readlink /usr/X11R6/bin/X)" @@ -63,6 +64,13 @@ else HAS_REALVNC="no" fi + + if [ -f /usr/X11R6/lib/modules/extensions/libvnc.so ] + then + HAS_TIGERVNC="yes" + else + HAS_TIGERVNC="no" + fi # show which server we use echo -en ${COLOREDSTAR}"Using '${xserver}' as x11-server " @@ -74,6 +82,9 @@ elif [[ ${HAS_REALVNC} = yes ]] then echo "with realvnc enabled ..." + elif [[ ${HAS_TIGERVNC} = yes ]] + then + echo "with tigervnc enabled ..." else echo "..." fi @@ -95,6 +106,7 @@ [[ ${HAS_VNC} = yes ]] && echo ' Load "vnc"' >> ${xfconfig} [[ ${HAS_REALVNC} = yes ]] && echo ' Load "vnc"' >> ${xfconfig} + [[ ${HAS_TIGERVNC} = yes ]] && echo ' Load "vnc"' >> ${xfconfig} echo 'EndSection' >> ${xfconfig} @@ -247,7 +259,7 @@ echo ' ViewPort 0 0' >> ${xfconfig} echo ' EndSubsection' >> ${xfconfig} - if [[ ${HAS_REALVNC} = yes ]] + if [[ ${HAS_REALVNC} = yes ]] || [[ ${HAS_TIGERVNC} = yes ]] then echo ' Option "SecurityTypes" "VncAuth"' >> ${xfconfig} echo ' Option "UserPasswdVerifier" "VncAuth"' >> ${xfconfig}