* Make sure the cache variable gets cached

* Don't search a bunch of .. directories for something we'd never find,
  because we don't imbed tclsh into LLVM.
* Look for various tclsh versions because some platforms don't install the
  tclsh link but just have tclsh8.3 or tclsh8.4 or some such.

llvm-svn: 18414
This commit is contained in:
Reid Spencer 2004-12-02 04:15:24 +00:00
parent 6adc42af75
commit 403097b52d

View File

@ -3,12 +3,12 @@ dnl platforms (notably FreeBSD), tclsh is named tclshX.Y - this handles
dnl that for us so we can get the latest installed tclsh version.
dnl
AC_DEFUN([DJ_AC_PATH_TCLSH], [
dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../
../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../..
/../../../../../.."
no_itcl=true
AC_MSG_CHECKING(for the tclsh program)
AC_ARG_WITH(tclinclude, [ --with-tclinclude directory where tcl headers are], with_tclinclude=${withval})
AC_MSG_CHECKING(for the tclsh program in tclinclude directory)
AC_ARG_WITH(tclinclude,
AS_HELP_STRING([--with-tclinclude],
[directory where tcl headers are]),
[with_tclinclude=${withval}],[with_tclinclude=''])
AC_CACHE_VAL(ac_cv_path_tclsh,[
dnl first check to see if --with-itclinclude was specified
if test x"${with_tclinclude}" != x ; then
@ -20,37 +20,20 @@ if test x"${with_tclinclude}" != x ; then
AC_MSG_ERROR([${with_tclinclude} directory doesn't contain tclsh])
fi
fi
])
dnl next check in private source directory
dnl since ls returns lowest version numbers first, reverse its output
if test x"${ac_cv_path_tclsh}" = x ; then
dnl find the top level Itcl source directory
for i in $dirlist; do
if test -n "`ls -dr $srcdir/$i/tcl* 2>/dev/null`" ; then
tclpath=$srcdir/$i
break
fi
done
dnl find the exact Itcl source dir. We do it this way, cause there
dnl might be multiple version of Itcl, and we want the most recent one.
for i in `ls -dr $tclpath/tcl* 2>/dev/null ` ; do
if test -f $i/src/tclsh ; then
ac_cv_path_tclsh=`(cd $i/src; pwd)`/tclsh
break
fi
done
fi
dnl see if one is installed
if test x"${ac_cv_path_tclsh}" = x ; then
AC_MSG_RESULT(none)
AC_PATH_PROG(tclsh, tclsh)
AC_MSG_RESULT(none)
AC_PATH_PROGS([TCLSH],[tclsh tclsh8.4 tclsh8.4.8 tclsh8.4.7 tclsh8.4.6 tclsh8.4.5 tclsh8.4.4 tclsh8.4.3 tclsh8.4.2 tclsh8.4.1 tclsh8.4.0 tclsh8.3 tclsh8.3.5 tclsh8.3.4 tclsh8.3.3 .tclsh8.3.2 tclsh8.3.1 tclsh8.3.0])
if test x"${TCLSH}" = x ; then
ac_cv_path_tclsh='';
else
ac_cv_path_tclsh="${TCLSH}";
fi
else
AC_MSG_RESULT(${ac_cv_path_tclsh})
AC_MSG_RESULT(${ac_cv_path_tclsh})
TCLSH="${ac_cv_path_tclsh}"
AC_SUBST(TCLSH)
fi
TCLSH="${ac_cv_path_tclsh}"
AC_SUBST(TCLSH)
])
])])