Mercurial > ecos
diff packages/io/usb/slave/current/host/configure @ 311:c0ffaecb376e
Include the following patch, and update affected files.
2002-08-27 Robin Farine <robin.farine@acn-group.ch>
* acinclude.m4 (ECOS_PATH_TCL): having found tclConfig.sh in
/<lib>/tcl<ver>, search for tkConfig.sh in /<lib>/tcl<ver> and in
/<lib>/tk<ver>.
| author | bartv |
|---|---|
| date | Tue, 27 Aug 2002 20:05:42 +0000 |
| parents | f58bc1b2c2bc |
| children | 3f4258400ba5 |
line wrap: on
line diff
--- a/packages/io/usb/slave/current/host/configure +++ b/packages/io/usb/slave/current/host/configure @@ -1669,10 +1669,21 @@ fi ecos_LIBS="${ecos_LIBS} -ltcl${ecos_tcl_version} ${TCL_LIBS}" fi - if test \! -r "${ecos_tcl_libdir}/tkConfig.sh" ; then + possible_tk_libdir=`echo ${ecos_tcl_libdir} | sed -e 's,tcl,tk,'` + possibles="${ecos_tcl_libdir} ${possible_tk_libdir}" + + ecos_tk_libdir="" + for i in ${possibles}; do + if test -r "$i/"tkConfig.sh""; then + ecos_tk_libdir=$i + break + fi + done + + if test \! -r "${ecos_tk_libdir}/tkConfig.sh" ; then { echo "configure: error: unable to locate Tk config file tkConfig.sh" 1>&2; exit 1; } else - . ${ecos_tcl_libdir}/tkConfig.sh + . ${ecos_tk_libdir}/tkConfig.sh ecos_tk_libs="-ltk${ecos_tcl_version} ${TK_LIBS}" for lib in ${TCL_LIBS} ; do ecos_tk_libs=`echo ${ecos_tk_libs} | sed -e "s!${lib}!!"` @@ -1698,7 +1709,8 @@ fi package_dir=`dirname ${package_dir}` package_dir=`dirname ${package_dir}` - possibles="${package_dir}/.. ${package_dir}/../.. ${package_dir}/../../.. ${package_dir}/../../../.. ${package_dir}/../../../../../.." + possibles="${package_dir}/.. ${package_dir}/../.. ${package_dir}/../../.. ${package_dir}/../../../.." + possibles="${possibles} ${package_dir}/../../../../.. ${package_dir}/../../../../../.." repository_root="" for i in ${possibles}; do