From 81de42c2a6ea259d371194c1373ed7d88ee00fb0 Mon Sep 17 00:00:00 2001 From: dkf Date: Wed, 12 Jan 2005 10:26:16 +0000 Subject: Make --with-tcl and --with-tk options more robust. [FRQ 951247] --- ChangeLog | 12 +++++++++--- unix/tcl.m4 | 14 ++++++++++++++ 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7fa8127..7508aa9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,15 @@ +2005-01-12 Donal K. Fellows + + * unix/tcl.m4 (SC_PATH_{TCL,TK}CONFIG): Added code to detect the + case when the --with-tcl/--with-tk arguments point to the config + scripts themselves and not their directory. If this is the case, + they now complain but keep working. [FRQ 951247] + 2005-01-10 Joe English * unix/Makefile.in, unix/configure.in, unix/tcl.m4, - unix/tclConfig.sh.in, unix/dltest/Makefile.in: - Remove ${DBGX}, ${TCL_DBGX} from Tcl build system - [Patch 1081595]. + * unix/tclConfig.sh.in, unix/dltest/Makefile.in: + Remove ${DBGX}, ${TCL_DBGX} from Tcl build system [Patch 1081595]. * unix/configure: regenerated 2005-01-10 Donal K. Fellows 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 -- cgit v0.12