diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2005-01-12 10:26:16 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2005-01-12 10:26:16 (GMT) |
| commit | 81de42c2a6ea259d371194c1373ed7d88ee00fb0 (patch) | |
| tree | a472871e4693c5483c77aee75637d8225d722e7d /unix | |
| parent | 1bd819c03fd52489a8536beb82f552ad658ff18f (diff) | |
| download | tcl-81de42c2a6ea259d371194c1373ed7d88ee00fb0.zip tcl-81de42c2a6ea259d371194c1373ed7d88ee00fb0.tar.gz tcl-81de42c2a6ea259d371194c1373ed7d88ee00fb0.tar.bz2 | |
Make --with-tcl and --with-tk options more robust. [FRQ 951247]
Diffstat (limited to 'unix')
| -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 |