# HG changeset patch # User bartv # Date 1030478742 0 # Node ID c0ffaecb376e87430f4869fdf2afedaa368ed619 # Parent 113a540ea6db6749b73e93a9a098cacdc32aa644 Include the following patch, and update affected files. 2002-08-27 Robin Farine * acinclude.m4 (ECOS_PATH_TCL): having found tclConfig.sh in //tcl, search for tkConfig.sh in //tcl and in //tk. diff --git a/acsupport/ChangeLog b/acsupport/ChangeLog --- a/acsupport/ChangeLog +++ b/acsupport/ChangeLog @@ -1,3 +1,9 @@ +2002-08-27 Robin Farine + + * acinclude.m4 (ECOS_PATH_TCL): having found tclConfig.sh in + //tcl, search for tkConfig.sh in //tcl and in + //tk. + 2002-08-03 Bart Veer * Created as part of autoconf reorganization. diff --git a/acsupport/acinclude.m4 b/acsupport/acinclude.m4 --- a/acsupport/acinclude.m4 +++ b/acsupport/acinclude.m4 @@ -504,10 +504,13 @@ AC_DEFUN(ECOS_PATH_TCL, [ 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}" + AC_FIND_FILE("tkConfig.sh", ${possibles}, ecos_tk_libdir) + if test \! -r "${ecos_tk_libdir}/tkConfig.sh" ; then AC_MSG_ERROR(unable to locate Tk config file tkConfig.sh) else - . ${ecos_tcl_libdir}/tkConfig.sh + . ${ecos_tk_libdir}/tkConfig.sh ecos_tk_libs="-ltk${ecos_tcl_version} ${TK_LIBS}" dnl Remove any library duplicates. It is not quite clear why, dnl but they seem to cause problems. @@ -798,7 +801,8 @@ AC_DEFUN(ECOS_PACKAGE_DIRS,[ 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}/../../../../../.." AC_FIND_DIR("acsupport", ${possibles}, repository_root) if test "${repository_root}" = "" ; then AC_MSG_ERROR([Failed to identify this package's position within the eCos repository]) diff --git a/host/Makefile.in b/host/Makefile.in --- a/host/Makefile.in +++ b/host/Makefile.in @@ -91,8 +91,8 @@ SUBDIRS = @SUBDIRS@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/../acsupport/mkinstalldirs CONFIG_CLEAN_FILES = -DIST_COMMON = README ChangeLog Makefile.am Makefile.in acinclude.m4 \ -aclocal.m4 configure configure.in +DIST_COMMON = ChangeLog Makefile.am Makefile.in acinclude.m4 aclocal.m4 \ +configure configure.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) diff --git a/host/libcdl/configure b/host/libcdl/configure --- a/host/libcdl/configure +++ b/host/libcdl/configure @@ -1945,10 +1945,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}!!"` diff --git a/host/tools/configtool/standalone/common/configure b/host/tools/configtool/standalone/common/configure --- a/host/tools/configtool/standalone/common/configure +++ b/host/tools/configtool/standalone/common/configure @@ -2050,10 +2050,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}!!"` diff --git a/packages/io/usb/slave/current/host/configure b/packages/io/usb/slave/current/host/configure --- 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