summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2011-04-12 14:18:56 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2011-04-12 14:18:56 (GMT)
commit34795d774d2b00b54f9ad73dc0423139b6b71c25 (patch)
tree9b0e2e6633c6e1d1c78532cedfa973a31d01b139
parent812efba4cae3a6acb22732255fe22ff92bbff9bf (diff)
downloadtcl-34795d774d2b00b54f9ad73dc0423139b6b71c25.zip
tcl-34795d774d2b00b54f9ad73dc0423139b6b71c25.tar.gz
tcl-34795d774d2b00b54f9ad73dc0423139b6b71c25.tar.bz2
minor nits, taken over from TEA (tclconfig)
-rwxr-xr-x[-rw-r--r--]tools/configure0
-rw-r--r--unix/tcl.m412
2 files changed, 5 insertions, 7 deletions
diff --git a/tools/configure b/tools/configure
index 98b5867..98b5867 100644..100755
--- a/tools/configure
+++ b/tools/configure
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 1bbcf3a..78eacd9 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -120,8 +120,7 @@ AC_DEFUN([SC_PATH_TCLCONFIG], [
if test x"${ac_cv_c_tclconfig}" = x ; then
TCL_BIN_DIR="# no Tcl configs found"
- AC_MSG_WARN([Can't find Tcl configuration definitions])
- exit 0
+ AC_MSG_ERROR([Can't find Tcl configuration definitions. Use --with-tcl to specify a directory containing tclConfig.sh])
else
no_tcl=
TCL_BIN_DIR="${ac_cv_c_tclconfig}"
@@ -251,8 +250,7 @@ AC_DEFUN([SC_PATH_TKCONFIG], [
if test x"${ac_cv_c_tkconfig}" = x ; then
TK_BIN_DIR="# no Tk configs found"
- AC_MSG_WARN([Can't find Tk configuration definitions])
- exit 0
+ AC_MSG_ERROR([Can't find Tk configuration definitions. Use --with-tk to specify a directory containing tkConfig.sh])
else
no_tk=
TK_BIN_DIR="${ac_cv_c_tkconfig}"
@@ -307,7 +305,7 @@ AC_DEFUN([SC_LOAD_TCLCONFIG], [
elif test "`uname -s`" = "Darwin"; then
# If Tcl was built as a framework, attempt to use the libraries
# from the framework at the given location so that linking works
- # against Tcl.framework installed in an arbitary location.
+ # against Tcl.framework installed in an arbitrary location.
case ${TCL_DEFS} in
*TCL_FRAMEWORK*)
if test -f "${TCL_BIN_DIR}/${TCL_LIB_FILE}"; then
@@ -390,7 +388,7 @@ AC_DEFUN([SC_LOAD_TKCONFIG], [
elif test "`uname -s`" = "Darwin"; then
# If Tk was built as a framework, attempt to use the libraries
# from the framework at the given location so that linking works
- # against Tk.framework installed in an arbitary location.
+ # against Tk.framework installed in an arbitrary location.
case ${TK_DEFS} in
*TK_FRAMEWORK*)
if test -f "${TK_BIN_DIR}/${TK_LIB_FILE}"; then
@@ -2369,7 +2367,7 @@ closedir(d);
#
# Results:
#
-# Sets the the following vars:
+# Sets the following vars:
# XINCLUDES
# XLIBSW
#