xserver: Branch 'master'

[Daniel Stone]

On Mon, Oct 09, 2006 at 05:25:20PM -0700, Alan Coopersmith wrote:
>     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 this is just the *.{c,h} thing, the better fix is to expand that by
hand.  I did that, but haven't pushed yet, mumble lack of DSL at home
mumble.

Cheers,
Daniel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://lists.x.org/archives/xorg/attachments/20061010/65e94e5e/attachment.pgp>