From 6776c0f0e9677a65ec36ceef9618ff701b99596c Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Mon, 9 Oct 2006 17:24:37 -0700 Subject: [PATCH] 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) --- configure.ac | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 43480c70d..7222106ef 100644 --- a/configure.ac +++ b/configure.ac @@ -582,7 +582,12 @@ if test "x$GLX" = xyes && ! test "x$MESA_SOURCE" = x; then 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