This is the mail archive of the
ecos-patches@sources.redhat.com
mailing list for the eCos project.
locate tkConfig.sh on Debian
- From: Robin Farine <robin dot farine at acn-group dot ch>
- To: eCos patches ml <ecos-patches at sources dot redhat dot com>
- Date: 27 Aug 2002 10:46:21 +0200
- Subject: locate tkConfig.sh on Debian
Index: acsupport/ChangeLog
===================================================================
RCS file: /home/cvs/eCos/base/acsupport/ChangeLog,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- acsupport/ChangeLog 26 Aug 2002 14:57:22 -0000 1.1.1.1
+++ acsupport/ChangeLog 27 Aug 2002 08:33:02 -0000 1.2
@@ -1,3 +1,9 @@
+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>.
+
2002-08-03 Bart Veer <bartv@ecoscentric.com>
* Created as part of autoconf reorganization.
Index: acsupport/acinclude.m4
===================================================================
RCS file: /home/cvs/eCos/base/acsupport/acinclude.m4,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- acsupport/acinclude.m4 26 Aug 2002 14:57:22 -0000 1.1.1.1
+++ acsupport/acinclude.m4 27 Aug 2002 08:18:28 -0000 1.2
@@ -504,10 +504,13 @@
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.