diff options
| author | das <das> | 2008-08-13 23:07:07 (GMT) |
|---|---|---|
| committer | das <das> | 2008-08-13 23:07:07 (GMT) |
| commit | e48a13a4a47c8dabc6edd925ae0f0d7eef67e047 (patch) | |
| tree | 6627ad56f748bbe38cca117e1cbac524f91c1795 | |
| parent | edb0651e6bc56331193b87b671cf154fbb556624 (diff) | |
| download | tcl-e48a13a4a47c8dabc6edd925ae0f0d7eef67e047.zip tcl-e48a13a4a47c8dabc6edd925ae0f0d7eef67e047.tar.gz tcl-e48a13a4a47c8dabc6edd925ae0f0d7eef67e047.tar.bz2 | |
* unix/Makefile.in: ensure Makefile shell is /bin/bash for
* unix/configure.in (SunOS): DTrace-enabled build on Solaris.
(followup to 2008-06-12) [Bug 2016584]
| -rw-r--r-- | unix/Makefile.in | 4 | ||||
| -rw-r--r-- | unix/configure.in | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index a2395eb..3ed9008 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -4,7 +4,7 @@ # "./configure", which is a configuration script generated by the "autoconf" # program (constructs like "@foo@" will get replaced in the actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.244 2008/08/11 21:58:07 dgp Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.245 2008/08/13 23:07:07 das Exp $ VERSION = @TCL_VERSION@ MAJOR_VERSION = @TCL_MAJOR_VERSION@ @@ -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" diff --git a/unix/configure.in b/unix/configure.in index 1caed5e..87ea9df 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -3,7 +3,7 @@ dnl This file is an input file used by the GNU "autoconf" program to dnl generate the file "configure", which is run during Tcl installation dnl to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.186 2008/08/12 15:10:40 dgp Exp $ +# RCS: @(#) $Id: configure.in,v 1.187 2008/08/13 23:07:07 das Exp $ AC_INIT([tcl],[8.6]) AC_PREREQ(2.59) @@ -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) |