xserver: Branch 'master'

[Alan Coopersmith]

 configure.ac |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletion(-)

New commits:
diff-tree 6776c0f0e9677a65ec36ceef9618ff701b99596c (from 4c342246300e06bdf5c9c62cc1d2f6aa57a524db)
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Mon Oct 9 17:24:37 2006 -0700

    Use bash on Solaris to run symlink-mesa.sh
    
    symlink-mesa.sh won't run with Solaris Bourne Shell (/bin/sh) so explicitly
    run it with /usr/bin/bash instead
    (cherry picked from cde68728860179dc84e615ccb378ce992513fd62 commit)

diff --git a/configure.ac b/configure.ac
index 43480c7..7222106 100644
--- a/configure.ac
+++ b/configure.ac
@@ -582,7 +582,12 @@ if test "x$GLX" = xyes && ! test "x$MESA
 	AC_DEFINE(GLXEXT, 1, [Build GLX extension])
 	GLX_LIBS='$(top_builddir)/GL/glx/libglx.la $(top_builddir)/GL/mesa/libGLcore.la'
 	test -d GL || mkdir GL
-        $srcdir/GL/symlink-mesa.sh $MESA_SOURCE GL/
+	case $host_os in
+	  solaris*) 	
+		SYMLINK_MESA="/usr/bin/bash $srcdir/GL/symlink-mesa.sh"	;;
+	  *)	SYMLINK_MESA=$srcdir/GL/symlink-mesa.sh ;;
+	esac
+	$SYMLINK_MESA $MESA_SOURCE GL/
 	if test $? -ne 0; then
 		AC_MSG_ERROR([Failed to link Mesa source tree.  Please specify a proper path to Mesa sources, or disable GLX.])
 	fi