Attachment "2016584.diff" to
ticket [2016584fff]
added by
das
2008-08-14 06:16:51.
Index: unix/Makefile.in
===================================================================
RCS file: /cvsroot/tcl/tcl/unix/Makefile.in,v
retrieving revision 1.244
diff -u -p -r1.244 Makefile.in
--- unix/Makefile.in 11 Aug 2008 21:58:07 -0000 1.244
+++ unix/Makefile.in 13 Aug 2008 22:35:46 -0000
@@ -139,7 +139,7 @@ NO_DEPRECATED_FLAGS =
# Some versions of make, like SGI's, use the following variable to determine
# which shell to use for executing commands:
-SHELL = /bin/sh
+SHELL = @MAKEFILE_SHELL@
# Tcl used to let the configure script choose which program to use for
# installing, but there are just too many different versions of "install"
Index: unix/configure.in
===================================================================
RCS file: /cvsroot/tcl/tcl/unix/configure.in,v
retrieving revision 1.186
diff -u -p -r1.186 configure.in
--- unix/configure.in 12 Aug 2008 15:10:40 -0000 1.186
+++ unix/configure.in 13 Aug 2008 22:35:46 -0000
@@ -657,6 +657,7 @@ if test $tcl_ok = yes; then
test -z "$ac_cv_path_DTRACE" && tcl_ok=no
fi
AC_MSG_CHECKING([whether to enable DTrace support])
+MAKEFILE_SHELL='/bin/sh'
if test $tcl_ok = yes; then
AC_DEFINE(USE_DTRACE, 1, [Are we building with DTrace support?])
DTRACE_SRC="\${DTRACE_SRC}"
@@ -667,6 +668,7 @@ if test $tcl_ok = yes; then
# Need to create an intermediate object file to ensure tclDTrace.o
# gets included when linking against the static tcl library.
STLIB_LD='stlib_ld () { /usr/ccs/bin/ld -r -o $${1%.a}.o "$${@:2}" && '"${STLIB_LD}"' $${1} $${1%.a}.o ; } && stlib_ld'
+ MAKEFILE_SHELL='/bin/bash'
# Force use of Sun ar and ranlib, the GNU versions choke on
# tclDTrace.o and the combined object file above.
AR='/usr/ccs/bin/ar'
@@ -868,6 +870,7 @@ AC_SUBST(INSTALL_TZDATA)
AC_SUBST(DTRACE_SRC)
AC_SUBST(DTRACE_HDR)
AC_SUBST(DTRACE_OBJ)
+AC_SUBST(MAKEFILE_SHELL)
AC_SUBST(BUILD_DLTEST)
AC_SUBST(TCL_PACKAGE_PATH)
