diff options
| author | dgp <dgp@users.sourceforge.net> | 2005-01-12 16:16:33 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2005-01-12 16:16:33 (GMT) |
| commit | 8f1bd02c7e5f595b8e77e3e31d2a47fe2cbce2f9 (patch) | |
| tree | 4a932979ec5169a6e75cd596cbe1fa278f7726b7 /unix/tcl.m4 | |
| parent | f764d9d90406be4f198097f27bcc4f143d19c0f7 (diff) | |
| download | tk-8f1bd02c7e5f595b8e77e3e31d2a47fe2cbce2f9.zip tk-8f1bd02c7e5f595b8e77e3e31d2a47fe2cbce2f9.tar.gz tk-8f1bd02c7e5f595b8e77e3e31d2a47fe2cbce2f9.tar.bz2 | |
* unix/tcl.m4: Sync'ed to Tcl's copy.
* unix/configure: autoconf-2.57
Diffstat (limited to 'unix/tcl.m4')
| -rw-r--r-- | unix/tcl.m4 | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/unix/tcl.m4 b/unix/tcl.m4 index a58e9f3..73488a6 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -33,6 +33,13 @@ AC_DEFUN(SC_PATH_TCLCONFIG, [ # First check to see if --with-tcl was specified. if test x"${with_tclconfig}" != x ; then + case ${with_tclconfig} in + */tclConfig.sh ) + if test -f ${with_tclconfig}; then + AC_MSG_WARN([--with-tcl argument should refer to directory containing tclConfig.sh, not to tclConfig.sh itself]) + with_tclconfig=`echo ${with_tclconfig} | sed 's!/tclConfig\.sh$!!'` + fi ;; + esac if test -f "${with_tclconfig}/tclConfig.sh" ; then ac_cv_c_tclconfig=`(cd ${with_tclconfig}; pwd)` else @@ -137,6 +144,13 @@ AC_DEFUN(SC_PATH_TKCONFIG, [ # First check to see if --with-tkconfig was specified. if test x"${with_tkconfig}" != x ; then + case ${with_tkconfig} in + */tkConfig.sh ) + if test -f ${with_tkconfig}; then + AC_MSG_WARN([--with-tk argument should refer to directory containing tkConfig.sh, not to tkConfig.sh itself]) + with_tkconfig=`echo ${with_tkconfig} | sed 's!/tkConfig\.sh$!!'` + fi ;; + esac if test -f "${with_tkconfig}/tkConfig.sh" ; then ac_cv_c_tkconfig=`(cd ${with_tkconfig}; pwd)` else |