Mercurial > ecos-v3_0-branch
changeset 2530:54ab5a936365
Update host-side configury Tcl macro
| author | bartv |
|---|---|
| date | Wed, 20 Aug 2008 14:41:39 +0000 |
| parents | 688b98888f5f |
| children | cc005a9f3575 |
| files | acsupport/ChangeLog acsupport/acinclude.m4 host/libcdl/ChangeLog host/libcdl/configure host/tools/configtool/standalone/common/ChangeLog host/tools/configtool/standalone/common/configure packages/hal/synth/arch/current/ChangeLog packages/hal/synth/arch/current/host/configure packages/io/usb/slave/current/ChangeLog packages/io/usb/slave/current/host/configure |
| diffstat | 10 files changed, 363 insertions(+), 43 deletions(-) [+] |
line wrap: on
line diff
--- a/acsupport/ChangeLog +++ b/acsupport/ChangeLog @@ -1,3 +1,7 @@ +2008-08-20 Bart Veer <bartv@ecoscentric.com> + + * acinclude.m4: update Tcl/Tk macro + 2008-08-18 Bart Veer <bartv@ecoscentric.com> * acinclude.m4: major update of host-side configury
--- a/acsupport/acinclude.m4 +++ b/acsupport/acinclude.m4 @@ -423,7 +423,11 @@ AC_DEFUN([ECOS_PATH_TCL], [ AC_REQUIRE([ECOS_PROG_MSVC]) dnl Where is the Tcl installation, and what version should be used? - AC_MSG_CHECKING(for Tcl installation) + dnl This macro is rather more verbose than usual because of the many + dnl problems encountered over the years with Tcl installations. + AC_MSG_CHECKING(for Tcl/Tk installation) + AC_MSG_RESULT() + AC_ARG_WITH(tcl,[ --with-tcl=<path> location of Tcl header and libraries]) AC_ARG_WITH(tcl-version,[ --with-tcl-version=<vsn> version of Tcl to be used]) @@ -496,10 +500,12 @@ AC_DEFUN([ECOS_PATH_TCL], [ possibles="${possibles} /usr/lib/tcl${with_tcl_version}" possibles="${possibles} /usr/lib/tk${with_tcl_version}" fi + AC_MSG_NOTICE(looking for tclConfig.sh in ${possibles}) AC_FIND_FILE("tclConfig.sh", ${possibles}, tclconfig) if test \! -r "${tclconfig}/tclConfig.sh" ; then AC_MSG_ERROR(unable to locate Tcl configuration file tclConfig.sh) else + AC_MSG_NOTICE(found ${tclconfig}/tclConfig.sh) . ${tclconfig}/tclConfig.sh dnl Now we need to figure out where to find the Tcl header files. @@ -507,10 +513,14 @@ AC_DEFUN([ECOS_PATH_TCL], [ dnl TCL_INCLUDE_DIR, otherwise use TCL_PREFIX/include if test -n "${TCL_INCLUDE_SPEC}" ; then ecos_tcl_incdir="${TCL_INCLUDE_SPEC}" + AC_MSG_NOTICE(trying TCL_INCLUDE_SPEC - looking for tcl.h in ${ecos_tcl_incdir}) elif test -n "${TCL_INC_DIR}" ; then ecos_tcl_incdir="${TCL_INC_DIR}" + AC_MSG_NOTICE(trying TCL_INC_DIR - looking for tcl.h in ${ecos_tcl_incdir}) else ecos_tcl_incdir="-I${TCL_PREFIX}/include" + AC_MSG_WARN(no TCL_INCLUDE_SPEC or TCL_INC_DIR in tclConfig.sh) + AC_MSG_NOTICE(fallback - looking for tcl.h in ${ecos_tcl_incdir}) fi dnl But verify that the resulting incdir is valid. ecos_tcl_tmpdir=`echo ${ecos_tcl_incdir} | sed -e "s:-I::g"` @@ -521,6 +531,7 @@ AC_DEFUN([ECOS_PATH_TCL], [ dnl cause problems on hosts where gcc is not the platform's dnl default compiler because of the use of unfixed headers. dnl Hence it is explicitly removed here. + AC_MSG_NOTICE(using ${ecos_tcl_incdir}) if test "${ecos_tcl_incdir}" != "-I/usr/include" ; then ecos_INCLUDES="${ecos_INCLUDES} ${ecos_tcl_incdir}" fi @@ -532,32 +543,40 @@ AC_DEFUN([ECOS_PATH_TCL], [ ecos_tcl_libs="" if test -n "${TCL_LIB_SPEC}" ; then ecos_tcl_libs="${ecos_LIBS} ${TCL_LIB_SPEC}" + AC_MSG_NOTICE(using TCL_LIB_SPEC ${TCL_LIB_SPEC}) else + AC_MSG_WARN(no TCL_LIB_SPEC in tclConfig.sh) if test "${with_tcl_version+set}" = set ; then + AC_MSG_NOTICE(fallback - looking for libtcl${with_tcl_version}.a in ${possibles}) AC_FIND_FILE("libtcl${with_tcl_version}.a", ${possibles}, libtcl) if test -r "${libtcl}/libtcl${with_tcl_version}.a" ; then ecos_tcl_libs="-L${libtcl} -ltcl${with_tcl_version}" + AC_MSG_NOTICE(using ${ecos_tcl_libs}) fi fi if test -z "${ecos_tcl_libs}" ; then + AC_MSG_NOTICE(fallback - looking for libtcl.a in ${possibles}) AC_FIND_FILE("libtcl.a", ${possibles}, libtcl) if test -r "${libtcl}/libtcl.a" ; then ecos_tcl_libs="-L${libtcl} -ltcl" + AC_MSG_NOTICE(using ${ecos_tcl_libs}) fi fi fi dnl If at this stage we have not found a libtcl.a, complain. if test -z "${ecos_tcl_libs}" ; then - AC_MSG_ERROR(${tclconfig}/tclConfig.sh does not define TCL_LIB_SPEC, and unable to find libtcl.a) + AC_MSG_ERROR(${tclconfig}/tclConfig.sh does not define TCL_LIB_SPEC, and unable to find libtcl.a) fi dnl tclConfig.sh may specify additional flags and libraries. if test -n "${TCL_LIBS}" ; then ecos_tcl_libs="${ecos_tcl_libs} ${TCL_LIBS}" + AC_MSG_NOTICE(using additional libraries for Tcl ${TCL_LIBS}) fi if test -n "${TCL_LD_FLAGS}" ; then ecos_tcl_libs="${ecos_tcl_libs} ${TCL_LD_FLAGS}" + AC_MSG_NOTICE(using additional linker flags for Tcl ${TCL_LD_FLAGS}) fi ecos_LIBS="${ecos_LIBS} ${ecos_tcl_libs}" fi @@ -568,18 +587,24 @@ AC_DEFUN([ECOS_PATH_TCL], [ dnl we assume that the Tk installation is in a similar dnl location to the Tcl one. possibles=`echo ${possibles} | sed -e 's,tcl,tk,g'` + AC_MSG_NOTICE(looking for tkConfig.sh in ${possibles}) AC_FIND_FILE("tkConfig.sh", ${possibles}, tkconfig) if test \! -r "${tkconfig}/tkConfig.sh" ; then AC_MSG_ERROR(unable to locate Tk config file tkConfig.sh) else + AC_MSG_NOTICE(found ${tkconfig}/tkConfig.sh) . ${tkconfig}/tkConfig.sh if test -n "${TK_INCLUDE_SPEC}" ; then - ecos_tk_includes="${TK_INCLUDE_SPEC}" + ecos_tk_includes="${TK_INCLUDE_SPEC}" + AC_MSG_NOTICE(trying TK_INCLUDE_SPEC - looking for tk.h in ${ecos_tk_includes}) elif test -n "${TK_INC_DIR}" ; then ecos_tk_includes="${TK_INC_DIR}" + AC_MSG_NOTICE(trying TK_INC_DIR - looking for tk.h in ${ecos_tk_includes}) else ecos_tk_includes="-I${TCL_PREFIX}/include" + AC_MSG_WARN(no TK_INCLUDE_SPEC or TK_INC_DIR in tkConfig.sh) + AC_MSG_NOTICE(fallback - looking for tk.h in ${ecos_tk_includes}) fi dnl But verify that the resulting incdir is valid. ecos_tk_tmpdir=`echo ${ecos_tk_includes} | sed -e "s:-I::g"` @@ -590,27 +615,33 @@ AC_DEFUN([ECOS_PATH_TCL], [ dnl cause problems on hosts where gcc is not the platform's dnl default compiler because of the use of unfixed headers. dnl Hence it is explicitly removed here. - if test "${ecos_tk_includes}" = "/usr/include" ; then + AC_MSG_NOTICE(using ${ecos_tk_includes}) + if test "${ecos_tk_includes}" = "-I/usr/include" ; then ecos_tk_includes="" fi fi dnl There may be additional include directories for X, although dnl unlikely on a Unix system. if test -n "${TK_XINCLUDES}" ; then + AC_MSG_NOTICE(adding TK_XINCLUDES ${TK_XINCLUDES}) ecos_tk_includes="${ecos_tk_includes} ${TK_XINCLUDES}" fi ecos_tk_libs="" if test -n "${TK_LIB_SPEC}" ; then ecos_tk_libs="${TK_LIB_SPEC}" + AC_MSG_NOTICE(trying TK_LIB_SPEC ${TK_LIB_SPEC}) else + AC_MSG_WARN(no TK_LIB_SPEC in tkConfig.sh) if test "${with_tcl_version+set}" = set ; then + AC_MSG_NOTICE(fallback - looking for libtk${with_tcl_version}.a in ${possibles}) AC_FIND_FILE("libtk${with_tcl_version}.a", ${possibles}, libtk) if test -r "${libtk}/libtk${with_tcl_version}.a" ; then - ecos_tk_libs="-L${libtk} -ltk${with_tcl_version}" + ecos_tk_libs="-L${libtk} -ltk${with_tcl_version}" fi fi if test -z "${ecos_tk_libs}" ; then + AC_MSG_NOTICE(fallback - looking for libtk.a in ${possibles}) AC_FIND_FILE("libtk.a", ${possibles}, libtk) if test -r "${libtk}/libtk.a" ; then ecos_tk_libs="-L${libtk} -ltk" @@ -619,6 +650,8 @@ AC_DEFUN([ECOS_PATH_TCL], [ fi if test -z "${ecos_tk_libs}" ; then AC_MSG_ERROR(${tkconfig}/tkConfig.sh does not define TK_LIB_SPEC, and unable to find libtk.a) + else + AC_MSG_NOTICE(using ${ecos_tk_libs}) fi dnl Tk may need additional libraries. Unfortunately some of these @@ -632,14 +665,17 @@ AC_DEFUN([ECOS_PATH_TCL], [ ecos_tk_tmp=`echo ${ecos_tk_tmp} | sed -e "s:${i}::g"` done ecos_tk_libs="${ecos_tk_libs} ${ecos_tk_tmp}" + AC_MSG_NOTICE(using additional libraries for Tk ${ecos_tk_tmp}) else ecos_tk_libs="${ecos_tk_libs} ${TK_LIBS}" + AC_MSG_NOTICE(using additional libraries for Tk ${TK_LIBS}) fi fi fi fi - AC_MSG_RESULT([${ecos_tcl_incdir} ${TCL_LIB_SPEC}]) + AC_MSG_CHECKING(for Tcl/Tk installation) + AC_MSG_RESULT(done) AC_SUBST(ecos_tk_includes) AC_SUBST(ecos_tk_libs) ])
--- a/host/libcdl/ChangeLog +++ b/host/libcdl/ChangeLog @@ -1,3 +1,7 @@ +2008-08-20 Bart Veer <bartv@ecoscentric.com> + + * configure: regenerate after update of Tcl macro + 2008-08-18 Bart Veer <bartv@ecoscentric.com> * Makefile.am, configure.in: update host-side configury
--- a/host/libcdl/configure +++ b/host/libcdl/configure @@ -4395,8 +4395,11 @@ echo "${ECHO_T}-I${ecos_infra_incdir} -L - { echo "$as_me:$LINENO: checking for Tcl installation" >&5 -echo $ECHO_N "checking for Tcl installation... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: checking for Tcl/Tk installation" >&5 +echo $ECHO_N "checking for Tcl/Tk installation... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: result: " >&5 +echo "${ECHO_T}" >&6; } + # Check whether --with-tcl was given. if test "${with_tcl+set}" = set; then @@ -4492,6 +4495,8 @@ echo "$as_me: error: unable to locate Tc possibles="${possibles} /usr/lib/tcl${with_tcl_version}" possibles="${possibles} /usr/lib/tk${with_tcl_version}" fi + { echo "$as_me:$LINENO: looking for tclConfig.sh in ${possibles}" >&5 +echo "$as_me: looking for tclConfig.sh in ${possibles}" >&6;} tclconfig="" for i in ${possibles}; do @@ -4506,14 +4511,24 @@ echo "$as_me: error: unable to locate Tc echo "$as_me: error: unable to locate Tcl configuration file tclConfig.sh" >&2;} { (exit 1); exit 1; }; } else + { echo "$as_me:$LINENO: found ${tclconfig}/tclConfig.sh" >&5 +echo "$as_me: found ${tclconfig}/tclConfig.sh" >&6;} . ${tclconfig}/tclConfig.sh if test -n "${TCL_INCLUDE_SPEC}" ; then ecos_tcl_incdir="${TCL_INCLUDE_SPEC}" + { echo "$as_me:$LINENO: trying TCL_INCLUDE_SPEC - looking for tcl.h in ${ecos_tcl_incdir}" >&5 +echo "$as_me: trying TCL_INCLUDE_SPEC - looking for tcl.h in ${ecos_tcl_incdir}" >&6;} elif test -n "${TCL_INC_DIR}" ; then ecos_tcl_incdir="${TCL_INC_DIR}" + { echo "$as_me:$LINENO: trying TCL_INC_DIR - looking for tcl.h in ${ecos_tcl_incdir}" >&5 +echo "$as_me: trying TCL_INC_DIR - looking for tcl.h in ${ecos_tcl_incdir}" >&6;} else ecos_tcl_incdir="-I${TCL_PREFIX}/include" + { echo "$as_me:$LINENO: WARNING: no TCL_INCLUDE_SPEC or TCL_INC_DIR in tclConfig.sh" >&5 +echo "$as_me: WARNING: no TCL_INCLUDE_SPEC or TCL_INC_DIR in tclConfig.sh" >&2;} + { echo "$as_me:$LINENO: fallback - looking for tcl.h in ${ecos_tcl_incdir}" >&5 +echo "$as_me: fallback - looking for tcl.h in ${ecos_tcl_incdir}" >&6;} fi ecos_tcl_tmpdir=`echo ${ecos_tcl_incdir} | sed -e "s:-I::g"` if test \! -r "${ecos_tcl_tmpdir}/tcl.h" ; then @@ -4521,7 +4536,9 @@ echo "$as_me: error: unable to locate Tc echo "$as_me: error: unable to locate Tcl header file tcl.h" >&2;} { (exit 1); exit 1; }; } else - if test "${ecos_tcl_incdir}" != "-I/usr/include" ; then + { echo "$as_me:$LINENO: using ${ecos_tcl_incdir}" >&5 +echo "$as_me: using ${ecos_tcl_incdir}" >&6;} + if test "${ecos_tcl_incdir}" != "-I/usr/include" ; then ecos_INCLUDES="${ecos_INCLUDES} ${ecos_tcl_incdir}" fi fi @@ -4529,8 +4546,14 @@ echo "$as_me: error: unable to locate Tc ecos_tcl_libs="" if test -n "${TCL_LIB_SPEC}" ; then ecos_tcl_libs="${ecos_LIBS} ${TCL_LIB_SPEC}" + { echo "$as_me:$LINENO: using TCL_LIB_SPEC ${TCL_LIB_SPEC}" >&5 +echo "$as_me: using TCL_LIB_SPEC ${TCL_LIB_SPEC}" >&6;} else + { echo "$as_me:$LINENO: WARNING: no TCL_LIB_SPEC in tclConfig.sh" >&5 +echo "$as_me: WARNING: no TCL_LIB_SPEC in tclConfig.sh" >&2;} if test "${with_tcl_version+set}" = set ; then + { echo "$as_me:$LINENO: fallback - looking for libtcl${with_tcl_version}.a in ${possibles}" >&5 +echo "$as_me: fallback - looking for libtcl${with_tcl_version}.a in ${possibles}" >&6;} libtcl="" for i in ${possibles}; do @@ -4542,9 +4565,13 @@ echo "$as_me: error: unable to locate Tc if test -r "${libtcl}/libtcl${with_tcl_version}.a" ; then ecos_tcl_libs="-L${libtcl} -ltcl${with_tcl_version}" + { echo "$as_me:$LINENO: using ${ecos_tcl_libs}" >&5 +echo "$as_me: using ${ecos_tcl_libs}" >&6;} fi fi if test -z "${ecos_tcl_libs}" ; then + { echo "$as_me:$LINENO: fallback - looking for libtcl.a in ${possibles}" >&5 +echo "$as_me: fallback - looking for libtcl.a in ${possibles}" >&6;} libtcl="" for i in ${possibles}; do @@ -4556,27 +4583,35 @@ echo "$as_me: error: unable to locate Tc if test -r "${libtcl}/libtcl.a" ; then ecos_tcl_libs="-L${libtcl} -ltcl" + { echo "$as_me:$LINENO: using ${ecos_tcl_libs}" >&5 +echo "$as_me: using ${ecos_tcl_libs}" >&6;} fi fi fi if test -z "${ecos_tcl_libs}" ; then - { { echo "$as_me:$LINENO: error: ${tclconfig}/tclConfig.sh does not define TCL_LIB_SPEC" >&5 + { { echo "$as_me:$LINENO: error: ${tclconfig}/tclConfig.sh does not define TCL_LIB_SPEC" >&5 echo "$as_me: error: ${tclconfig}/tclConfig.sh does not define TCL_LIB_SPEC" >&2;} { (exit and unable to find libtcl.a); exit and unable to find libtcl.a; }; } fi if test -n "${TCL_LIBS}" ; then ecos_tcl_libs="${ecos_tcl_libs} ${TCL_LIBS}" + { echo "$as_me:$LINENO: using additional libraries for Tcl ${TCL_LIBS}" >&5 +echo "$as_me: using additional libraries for Tcl ${TCL_LIBS}" >&6;} fi if test -n "${TCL_LD_FLAGS}" ; then ecos_tcl_libs="${ecos_tcl_libs} ${TCL_LD_FLAGS}" + { echo "$as_me:$LINENO: using additional linker flags for Tcl ${TCL_LD_FLAGS}" >&5 +echo "$as_me: using additional linker flags for Tcl ${TCL_LD_FLAGS}" >&6;} fi ecos_LIBS="${ecos_LIBS} ${ecos_tcl_libs}" fi possibles=`echo ${possibles} | sed -e 's,tcl,tk,g'` + { echo "$as_me:$LINENO: looking for tkConfig.sh in ${possibles}" >&5 +echo "$as_me: looking for tkConfig.sh in ${possibles}" >&6;} tkconfig="" for i in ${possibles}; do @@ -4591,14 +4626,24 @@ echo "$as_me: error: ${tclconfig}/tclCon echo "$as_me: error: unable to locate Tk config file tkConfig.sh" >&2;} { (exit 1); exit 1; }; } else + { echo "$as_me:$LINENO: found ${tkconfig}/tkConfig.sh" >&5 +echo "$as_me: found ${tkconfig}/tkConfig.sh" >&6;} . ${tkconfig}/tkConfig.sh if test -n "${TK_INCLUDE_SPEC}" ; then - ecos_tk_includes="${TK_INCLUDE_SPEC}" + ecos_tk_includes="${TK_INCLUDE_SPEC}" + { echo "$as_me:$LINENO: trying TK_INCLUDE_SPEC - looking for tk.h in ${ecos_tk_includes}" >&5 +echo "$as_me: trying TK_INCLUDE_SPEC - looking for tk.h in ${ecos_tk_includes}" >&6;} elif test -n "${TK_INC_DIR}" ; then ecos_tk_includes="${TK_INC_DIR}" + { echo "$as_me:$LINENO: trying TK_INC_DIR - looking for tk.h in ${ecos_tk_includes}" >&5 +echo "$as_me: trying TK_INC_DIR - looking for tk.h in ${ecos_tk_includes}" >&6;} else ecos_tk_includes="-I${TCL_PREFIX}/include" + { echo "$as_me:$LINENO: WARNING: no TK_INCLUDE_SPEC or TK_INC_DIR in tkConfig.sh" >&5 +echo "$as_me: WARNING: no TK_INCLUDE_SPEC or TK_INC_DIR in tkConfig.sh" >&2;} + { echo "$as_me:$LINENO: fallback - looking for tk.h in ${ecos_tk_includes}" >&5 +echo "$as_me: fallback - looking for tk.h in ${ecos_tk_includes}" >&6;} fi ecos_tk_tmpdir=`echo ${ecos_tk_includes} | sed -e "s:-I::g"` if test \! -r "${ecos_tk_tmpdir}/tk.h" ; then @@ -4606,19 +4651,29 @@ echo "$as_me: error: unable to locate Tk echo "$as_me: error: unable to locate Tk header file tk.h" >&2;} { (exit 1); exit 1; }; } else - if test "${ecos_tk_includes}" = "/usr/include" ; then + { echo "$as_me:$LINENO: using ${ecos_tk_includes}" >&5 +echo "$as_me: using ${ecos_tk_includes}" >&6;} + if test "${ecos_tk_includes}" = "-I/usr/include" ; then ecos_tk_includes="" fi fi if test -n "${TK_XINCLUDES}" ; then + { echo "$as_me:$LINENO: adding TK_XINCLUDES ${TK_XINCLUDES}" >&5 +echo "$as_me: adding TK_XINCLUDES ${TK_XINCLUDES}" >&6;} ecos_tk_includes="${ecos_tk_includes} ${TK_XINCLUDES}" fi ecos_tk_libs="" if test -n "${TK_LIB_SPEC}" ; then ecos_tk_libs="${TK_LIB_SPEC}" + { echo "$as_me:$LINENO: trying TK_LIB_SPEC ${TK_LIB_SPEC}" >&5 +echo "$as_me: trying TK_LIB_SPEC ${TK_LIB_SPEC}" >&6;} else + { echo "$as_me:$LINENO: WARNING: no TK_LIB_SPEC in tkConfig.sh" >&5 +echo "$as_me: WARNING: no TK_LIB_SPEC in tkConfig.sh" >&2;} if test "${with_tcl_version+set}" = set ; then + { echo "$as_me:$LINENO: fallback - looking for libtk${with_tcl_version}.a in ${possibles}" >&5 +echo "$as_me: fallback - looking for libtk${with_tcl_version}.a in ${possibles}" >&6;} libtk="" for i in ${possibles}; do @@ -4629,10 +4684,12 @@ echo "$as_me: error: unable to locate Tk done if test -r "${libtk}/libtk${with_tcl_version}.a" ; then - ecos_tk_libs="-L${libtk} -ltk${with_tcl_version}" + ecos_tk_libs="-L${libtk} -ltk${with_tcl_version}" fi fi if test -z "${ecos_tk_libs}" ; then + { echo "$as_me:$LINENO: fallback - looking for libtk.a in ${possibles}" >&5 +echo "$as_me: fallback - looking for libtk.a in ${possibles}" >&6;} libtk="" for i in ${possibles}; do @@ -4651,6 +4708,9 @@ echo "$as_me: error: unable to locate Tk { { echo "$as_me:$LINENO: error: ${tkconfig}/tkConfig.sh does not define TK_LIB_SPEC" >&5 echo "$as_me: error: ${tkconfig}/tkConfig.sh does not define TK_LIB_SPEC" >&2;} { (exit and unable to find libtk.a); exit and unable to find libtk.a; }; } + else + { echo "$as_me:$LINENO: using ${ecos_tk_libs}" >&5 +echo "$as_me: using ${ecos_tk_libs}" >&6;} fi if test -n "${TK_LIBS}" ; then @@ -4660,15 +4720,21 @@ echo "$as_me: error: ${tkconfig}/tkConfi ecos_tk_tmp=`echo ${ecos_tk_tmp} | sed -e "s:${i}::g"` done ecos_tk_libs="${ecos_tk_libs} ${ecos_tk_tmp}" + { echo "$as_me:$LINENO: using additional libraries for Tk ${ecos_tk_tmp}" >&5 +echo "$as_me: using additional libraries for Tk ${ecos_tk_tmp}" >&6;} else ecos_tk_libs="${ecos_tk_libs} ${TK_LIBS}" + { echo "$as_me:$LINENO: using additional libraries for Tk ${TK_LIBS}" >&5 +echo "$as_me: using additional libraries for Tk ${TK_LIBS}" >&6;} fi fi fi fi - { echo "$as_me:$LINENO: result: ${ecos_tcl_incdir} ${TCL_LIB_SPEC}" >&5 -echo "${ECHO_T}${ecos_tcl_incdir} ${TCL_LIB_SPEC}" >&6; } + { echo "$as_me:$LINENO: checking for Tcl/Tk installation" >&5 +echo $ECHO_N "checking for Tcl/Tk installation... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: result: done" >&5 +echo "${ECHO_T}done" >&6; }
--- a/host/tools/configtool/standalone/common/ChangeLog +++ b/host/tools/configtool/standalone/common/ChangeLog @@ -1,3 +1,7 @@ +2008-08-20 Bart Veer <bartv@ecoscentric.com> + + * configure: regenerate after update of Tcl macro + 2008-08-18 Bart Veer <bartv@ecoscentric.com> * Makefile.am: update host-side configury
--- a/host/tools/configtool/standalone/common/configure +++ b/host/tools/configtool/standalone/common/configure @@ -4434,8 +4434,11 @@ echo "${ECHO_T}-I${ecos_infra_incdir} -L - { echo "$as_me:$LINENO: checking for Tcl installation" >&5 -echo $ECHO_N "checking for Tcl installation... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: checking for Tcl/Tk installation" >&5 +echo $ECHO_N "checking for Tcl/Tk installation... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: result: " >&5 +echo "${ECHO_T}" >&6; } + # Check whether --with-tcl was given. if test "${with_tcl+set}" = set; then @@ -4531,6 +4534,8 @@ echo "$as_me: error: unable to locate Tc possibles="${possibles} /usr/lib/tcl${with_tcl_version}" possibles="${possibles} /usr/lib/tk${with_tcl_version}" fi + { echo "$as_me:$LINENO: looking for tclConfig.sh in ${possibles}" >&5 +echo "$as_me: looking for tclConfig.sh in ${possibles}" >&6;} tclconfig="" for i in ${possibles}; do @@ -4545,14 +4550,24 @@ echo "$as_me: error: unable to locate Tc echo "$as_me: error: unable to locate Tcl configuration file tclConfig.sh" >&2;} { (exit 1); exit 1; }; } else + { echo "$as_me:$LINENO: found ${tclconfig}/tclConfig.sh" >&5 +echo "$as_me: found ${tclconfig}/tclConfig.sh" >&6;} . ${tclconfig}/tclConfig.sh if test -n "${TCL_INCLUDE_SPEC}" ; then ecos_tcl_incdir="${TCL_INCLUDE_SPEC}" + { echo "$as_me:$LINENO: trying TCL_INCLUDE_SPEC - looking for tcl.h in ${ecos_tcl_incdir}" >&5 +echo "$as_me: trying TCL_INCLUDE_SPEC - looking for tcl.h in ${ecos_tcl_incdir}" >&6;} elif test -n "${TCL_INC_DIR}" ; then ecos_tcl_incdir="${TCL_INC_DIR}" + { echo "$as_me:$LINENO: trying TCL_INC_DIR - looking for tcl.h in ${ecos_tcl_incdir}" >&5 +echo "$as_me: trying TCL_INC_DIR - looking for tcl.h in ${ecos_tcl_incdir}" >&6;} else ecos_tcl_incdir="-I${TCL_PREFIX}/include" + { echo "$as_me:$LINENO: WARNING: no TCL_INCLUDE_SPEC or TCL_INC_DIR in tclConfig.sh" >&5 +echo "$as_me: WARNING: no TCL_INCLUDE_SPEC or TCL_INC_DIR in tclConfig.sh" >&2;} + { echo "$as_me:$LINENO: fallback - looking for tcl.h in ${ecos_tcl_incdir}" >&5 +echo "$as_me: fallback - looking for tcl.h in ${ecos_tcl_incdir}" >&6;} fi ecos_tcl_tmpdir=`echo ${ecos_tcl_incdir} | sed -e "s:-I::g"` if test \! -r "${ecos_tcl_tmpdir}/tcl.h" ; then @@ -4560,7 +4575,9 @@ echo "$as_me: error: unable to locate Tc echo "$as_me: error: unable to locate Tcl header file tcl.h" >&2;} { (exit 1); exit 1; }; } else - if test "${ecos_tcl_incdir}" != "-I/usr/include" ; then + { echo "$as_me:$LINENO: using ${ecos_tcl_incdir}" >&5 +echo "$as_me: using ${ecos_tcl_incdir}" >&6;} + if test "${ecos_tcl_incdir}" != "-I/usr/include" ; then ecos_INCLUDES="${ecos_INCLUDES} ${ecos_tcl_incdir}" fi fi @@ -4568,8 +4585,14 @@ echo "$as_me: error: unable to locate Tc ecos_tcl_libs="" if test -n "${TCL_LIB_SPEC}" ; then ecos_tcl_libs="${ecos_LIBS} ${TCL_LIB_SPEC}" + { echo "$as_me:$LINENO: using TCL_LIB_SPEC ${TCL_LIB_SPEC}" >&5 +echo "$as_me: using TCL_LIB_SPEC ${TCL_LIB_SPEC}" >&6;} else + { echo "$as_me:$LINENO: WARNING: no TCL_LIB_SPEC in tclConfig.sh" >&5 +echo "$as_me: WARNING: no TCL_LIB_SPEC in tclConfig.sh" >&2;} if test "${with_tcl_version+set}" = set ; then + { echo "$as_me:$LINENO: fallback - looking for libtcl${with_tcl_version}.a in ${possibles}" >&5 +echo "$as_me: fallback - looking for libtcl${with_tcl_version}.a in ${possibles}" >&6;} libtcl="" for i in ${possibles}; do @@ -4581,9 +4604,13 @@ echo "$as_me: error: unable to locate Tc if test -r "${libtcl}/libtcl${with_tcl_version}.a" ; then ecos_tcl_libs="-L${libtcl} -ltcl${with_tcl_version}" + { echo "$as_me:$LINENO: using ${ecos_tcl_libs}" >&5 +echo "$as_me: using ${ecos_tcl_libs}" >&6;} fi fi if test -z "${ecos_tcl_libs}" ; then + { echo "$as_me:$LINENO: fallback - looking for libtcl.a in ${possibles}" >&5 +echo "$as_me: fallback - looking for libtcl.a in ${possibles}" >&6;} libtcl="" for i in ${possibles}; do @@ -4595,27 +4622,35 @@ echo "$as_me: error: unable to locate Tc if test -r "${libtcl}/libtcl.a" ; then ecos_tcl_libs="-L${libtcl} -ltcl" + { echo "$as_me:$LINENO: using ${ecos_tcl_libs}" >&5 +echo "$as_me: using ${ecos_tcl_libs}" >&6;} fi fi fi if test -z "${ecos_tcl_libs}" ; then - { { echo "$as_me:$LINENO: error: ${tclconfig}/tclConfig.sh does not define TCL_LIB_SPEC" >&5 + { { echo "$as_me:$LINENO: error: ${tclconfig}/tclConfig.sh does not define TCL_LIB_SPEC" >&5 echo "$as_me: error: ${tclconfig}/tclConfig.sh does not define TCL_LIB_SPEC" >&2;} { (exit and unable to find libtcl.a); exit and unable to find libtcl.a; }; } fi if test -n "${TCL_LIBS}" ; then ecos_tcl_libs="${ecos_tcl_libs} ${TCL_LIBS}" + { echo "$as_me:$LINENO: using additional libraries for Tcl ${TCL_LIBS}" >&5 +echo "$as_me: using additional libraries for Tcl ${TCL_LIBS}" >&6;} fi if test -n "${TCL_LD_FLAGS}" ; then ecos_tcl_libs="${ecos_tcl_libs} ${TCL_LD_FLAGS}" + { echo "$as_me:$LINENO: using additional linker flags for Tcl ${TCL_LD_FLAGS}" >&5 +echo "$as_me: using additional linker flags for Tcl ${TCL_LD_FLAGS}" >&6;} fi ecos_LIBS="${ecos_LIBS} ${ecos_tcl_libs}" fi possibles=`echo ${possibles} | sed -e 's,tcl,tk,g'` + { echo "$as_me:$LINENO: looking for tkConfig.sh in ${possibles}" >&5 +echo "$as_me: looking for tkConfig.sh in ${possibles}" >&6;} tkconfig="" for i in ${possibles}; do @@ -4630,14 +4665,24 @@ echo "$as_me: error: ${tclconfig}/tclCon echo "$as_me: error: unable to locate Tk config file tkConfig.sh" >&2;} { (exit 1); exit 1; }; } else + { echo "$as_me:$LINENO: found ${tkconfig}/tkConfig.sh" >&5 +echo "$as_me: found ${tkconfig}/tkConfig.sh" >&6;} . ${tkconfig}/tkConfig.sh if test -n "${TK_INCLUDE_SPEC}" ; then - ecos_tk_includes="${TK_INCLUDE_SPEC}" + ecos_tk_includes="${TK_INCLUDE_SPEC}" + { echo "$as_me:$LINENO: trying TK_INCLUDE_SPEC - looking for tk.h in ${ecos_tk_includes}" >&5 +echo "$as_me: trying TK_INCLUDE_SPEC - looking for tk.h in ${ecos_tk_includes}" >&6;} elif test -n "${TK_INC_DIR}" ; then ecos_tk_includes="${TK_INC_DIR}" + { echo "$as_me:$LINENO: trying TK_INC_DIR - looking for tk.h in ${ecos_tk_includes}" >&5 +echo "$as_me: trying TK_INC_DIR - looking for tk.h in ${ecos_tk_includes}" >&6;} else ecos_tk_includes="-I${TCL_PREFIX}/include" + { echo "$as_me:$LINENO: WARNING: no TK_INCLUDE_SPEC or TK_INC_DIR in tkConfig.sh" >&5 +echo "$as_me: WARNING: no TK_INCLUDE_SPEC or TK_INC_DIR in tkConfig.sh" >&2;} + { echo "$as_me:$LINENO: fallback - looking for tk.h in ${ecos_tk_includes}" >&5 +echo "$as_me: fallback - looking for tk.h in ${ecos_tk_includes}" >&6;} fi ecos_tk_tmpdir=`echo ${ecos_tk_includes} | sed -e "s:-I::g"` if test \! -r "${ecos_tk_tmpdir}/tk.h" ; then @@ -4645,19 +4690,29 @@ echo "$as_me: error: unable to locate Tk echo "$as_me: error: unable to locate Tk header file tk.h" >&2;} { (exit 1); exit 1; }; } else - if test "${ecos_tk_includes}" = "/usr/include" ; then + { echo "$as_me:$LINENO: using ${ecos_tk_includes}" >&5 +echo "$as_me: using ${ecos_tk_includes}" >&6;} + if test "${ecos_tk_includes}" = "-I/usr/include" ; then ecos_tk_includes="" fi fi if test -n "${TK_XINCLUDES}" ; then + { echo "$as_me:$LINENO: adding TK_XINCLUDES ${TK_XINCLUDES}" >&5 +echo "$as_me: adding TK_XINCLUDES ${TK_XINCLUDES}" >&6;} ecos_tk_includes="${ecos_tk_includes} ${TK_XINCLUDES}" fi ecos_tk_libs="" if test -n "${TK_LIB_SPEC}" ; then ecos_tk_libs="${TK_LIB_SPEC}" + { echo "$as_me:$LINENO: trying TK_LIB_SPEC ${TK_LIB_SPEC}" >&5 +echo "$as_me: trying TK_LIB_SPEC ${TK_LIB_SPEC}" >&6;} else + { echo "$as_me:$LINENO: WARNING: no TK_LIB_SPEC in tkConfig.sh" >&5 +echo "$as_me: WARNING: no TK_LIB_SPEC in tkConfig.sh" >&2;} if test "${with_tcl_version+set}" = set ; then + { echo "$as_me:$LINENO: fallback - looking for libtk${with_tcl_version}.a in ${possibles}" >&5 +echo "$as_me: fallback - looking for libtk${with_tcl_version}.a in ${possibles}" >&6;} libtk="" for i in ${possibles}; do @@ -4668,10 +4723,12 @@ echo "$as_me: error: unable to locate Tk done if test -r "${libtk}/libtk${with_tcl_version}.a" ; then - ecos_tk_libs="-L${libtk} -ltk${with_tcl_version}" + ecos_tk_libs="-L${libtk} -ltk${with_tcl_version}" fi fi if test -z "${ecos_tk_libs}" ; then + { echo "$as_me:$LINENO: fallback - looking for libtk.a in ${possibles}" >&5 +echo "$as_me: fallback - looking for libtk.a in ${possibles}" >&6;} libtk="" for i in ${possibles}; do @@ -4690,6 +4747,9 @@ echo "$as_me: error: unable to locate Tk { { echo "$as_me:$LINENO: error: ${tkconfig}/tkConfig.sh does not define TK_LIB_SPEC" >&5 echo "$as_me: error: ${tkconfig}/tkConfig.sh does not define TK_LIB_SPEC" >&2;} { (exit and unable to find libtk.a); exit and unable to find libtk.a; }; } + else + { echo "$as_me:$LINENO: using ${ecos_tk_libs}" >&5 +echo "$as_me: using ${ecos_tk_libs}" >&6;} fi if test -n "${TK_LIBS}" ; then @@ -4699,15 +4759,21 @@ echo "$as_me: error: ${tkconfig}/tkConfi ecos_tk_tmp=`echo ${ecos_tk_tmp} | sed -e "s:${i}::g"` done ecos_tk_libs="${ecos_tk_libs} ${ecos_tk_tmp}" + { echo "$as_me:$LINENO: using additional libraries for Tk ${ecos_tk_tmp}" >&5 +echo "$as_me: using additional libraries for Tk ${ecos_tk_tmp}" >&6;} else ecos_tk_libs="${ecos_tk_libs} ${TK_LIBS}" + { echo "$as_me:$LINENO: using additional libraries for Tk ${TK_LIBS}" >&5 +echo "$as_me: using additional libraries for Tk ${TK_LIBS}" >&6;} fi fi fi fi - { echo "$as_me:$LINENO: result: ${ecos_tcl_incdir} ${TCL_LIB_SPEC}" >&5 -echo "${ECHO_T}${ecos_tcl_incdir} ${TCL_LIB_SPEC}" >&6; } + { echo "$as_me:$LINENO: checking for Tcl/Tk installation" >&5 +echo $ECHO_N "checking for Tcl/Tk installation... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: result: done" >&5 +echo "${ECHO_T}done" >&6; }
--- a/packages/hal/synth/arch/current/ChangeLog +++ b/packages/hal/synth/arch/current/ChangeLog @@ -1,3 +1,7 @@ +2008-08-20 Bart Veer <bartv@ecoscentric.com> + + * host/configure: regenerate after update of Tcl macro + 2008-08-18 Bart Veer <bartv@ecoscentric.com> * host/Makefile.am, host/configure.in, ecosynth.c: update
--- a/packages/hal/synth/arch/current/host/configure +++ b/packages/hal/synth/arch/current/host/configure @@ -4008,8 +4008,11 @@ echo "${ECHO_T}done" >&6; } - { echo "$as_me:$LINENO: checking for Tcl installation" >&5 -echo $ECHO_N "checking for Tcl installation... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: checking for Tcl/Tk installation" >&5 +echo $ECHO_N "checking for Tcl/Tk installation... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: result: " >&5 +echo "${ECHO_T}" >&6; } + # Check whether --with-tcl was given. if test "${with_tcl+set}" = set; then @@ -4105,6 +4108,8 @@ echo "$as_me: error: unable to locate Tc possibles="${possibles} /usr/lib/tcl${with_tcl_version}" possibles="${possibles} /usr/lib/tk${with_tcl_version}" fi + { echo "$as_me:$LINENO: looking for tclConfig.sh in ${possibles}" >&5 +echo "$as_me: looking for tclConfig.sh in ${possibles}" >&6;} tclconfig="" for i in ${possibles}; do @@ -4119,14 +4124,24 @@ echo "$as_me: error: unable to locate Tc echo "$as_me: error: unable to locate Tcl configuration file tclConfig.sh" >&2;} { (exit 1); exit 1; }; } else + { echo "$as_me:$LINENO: found ${tclconfig}/tclConfig.sh" >&5 +echo "$as_me: found ${tclconfig}/tclConfig.sh" >&6;} . ${tclconfig}/tclConfig.sh if test -n "${TCL_INCLUDE_SPEC}" ; then ecos_tcl_incdir="${TCL_INCLUDE_SPEC}" + { echo "$as_me:$LINENO: trying TCL_INCLUDE_SPEC - looking for tcl.h in ${ecos_tcl_incdir}" >&5 +echo "$as_me: trying TCL_INCLUDE_SPEC - looking for tcl.h in ${ecos_tcl_incdir}" >&6;} elif test -n "${TCL_INC_DIR}" ; then ecos_tcl_incdir="${TCL_INC_DIR}" + { echo "$as_me:$LINENO: trying TCL_INC_DIR - looking for tcl.h in ${ecos_tcl_incdir}" >&5 +echo "$as_me: trying TCL_INC_DIR - looking for tcl.h in ${ecos_tcl_incdir}" >&6;} else ecos_tcl_incdir="-I${TCL_PREFIX}/include" + { echo "$as_me:$LINENO: WARNING: no TCL_INCLUDE_SPEC or TCL_INC_DIR in tclConfig.sh" >&5 +echo "$as_me: WARNING: no TCL_INCLUDE_SPEC or TCL_INC_DIR in tclConfig.sh" >&2;} + { echo "$as_me:$LINENO: fallback - looking for tcl.h in ${ecos_tcl_incdir}" >&5 +echo "$as_me: fallback - looking for tcl.h in ${ecos_tcl_incdir}" >&6;} fi ecos_tcl_tmpdir=`echo ${ecos_tcl_incdir} | sed -e "s:-I::g"` if test \! -r "${ecos_tcl_tmpdir}/tcl.h" ; then @@ -4134,7 +4149,9 @@ echo "$as_me: error: unable to locate Tc echo "$as_me: error: unable to locate Tcl header file tcl.h" >&2;} { (exit 1); exit 1; }; } else - if test "${ecos_tcl_incdir}" != "-I/usr/include" ; then + { echo "$as_me:$LINENO: using ${ecos_tcl_incdir}" >&5 +echo "$as_me: using ${ecos_tcl_incdir}" >&6;} + if test "${ecos_tcl_incdir}" != "-I/usr/include" ; then ecos_INCLUDES="${ecos_INCLUDES} ${ecos_tcl_incdir}" fi fi @@ -4142,8 +4159,14 @@ echo "$as_me: error: unable to locate Tc ecos_tcl_libs="" if test -n "${TCL_LIB_SPEC}" ; then ecos_tcl_libs="${ecos_LIBS} ${TCL_LIB_SPEC}" + { echo "$as_me:$LINENO: using TCL_LIB_SPEC ${TCL_LIB_SPEC}" >&5 +echo "$as_me: using TCL_LIB_SPEC ${TCL_LIB_SPEC}" >&6;} else + { echo "$as_me:$LINENO: WARNING: no TCL_LIB_SPEC in tclConfig.sh" >&5 +echo "$as_me: WARNING: no TCL_LIB_SPEC in tclConfig.sh" >&2;} if test "${with_tcl_version+set}" = set ; then + { echo "$as_me:$LINENO: fallback - looking for libtcl${with_tcl_version}.a in ${possibles}" >&5 +echo "$as_me: fallback - looking for libtcl${with_tcl_version}.a in ${possibles}" >&6;} libtcl="" for i in ${possibles}; do @@ -4155,9 +4178,13 @@ echo "$as_me: error: unable to locate Tc if test -r "${libtcl}/libtcl${with_tcl_version}.a" ; then ecos_tcl_libs="-L${libtcl} -ltcl${with_tcl_version}" + { echo "$as_me:$LINENO: using ${ecos_tcl_libs}" >&5 +echo "$as_me: using ${ecos_tcl_libs}" >&6;} fi fi if test -z "${ecos_tcl_libs}" ; then + { echo "$as_me:$LINENO: fallback - looking for libtcl.a in ${possibles}" >&5 +echo "$as_me: fallback - looking for libtcl.a in ${possibles}" >&6;} libtcl="" for i in ${possibles}; do @@ -4169,27 +4196,35 @@ echo "$as_me: error: unable to locate Tc if test -r "${libtcl}/libtcl.a" ; then ecos_tcl_libs="-L${libtcl} -ltcl" + { echo "$as_me:$LINENO: using ${ecos_tcl_libs}" >&5 +echo "$as_me: using ${ecos_tcl_libs}" >&6;} fi fi fi if test -z "${ecos_tcl_libs}" ; then - { { echo "$as_me:$LINENO: error: ${tclconfig}/tclConfig.sh does not define TCL_LIB_SPEC" >&5 + { { echo "$as_me:$LINENO: error: ${tclconfig}/tclConfig.sh does not define TCL_LIB_SPEC" >&5 echo "$as_me: error: ${tclconfig}/tclConfig.sh does not define TCL_LIB_SPEC" >&2;} { (exit and unable to find libtcl.a); exit and unable to find libtcl.a; }; } fi if test -n "${TCL_LIBS}" ; then ecos_tcl_libs="${ecos_tcl_libs} ${TCL_LIBS}" + { echo "$as_me:$LINENO: using additional libraries for Tcl ${TCL_LIBS}" >&5 +echo "$as_me: using additional libraries for Tcl ${TCL_LIBS}" >&6;} fi if test -n "${TCL_LD_FLAGS}" ; then ecos_tcl_libs="${ecos_tcl_libs} ${TCL_LD_FLAGS}" + { echo "$as_me:$LINENO: using additional linker flags for Tcl ${TCL_LD_FLAGS}" >&5 +echo "$as_me: using additional linker flags for Tcl ${TCL_LD_FLAGS}" >&6;} fi ecos_LIBS="${ecos_LIBS} ${ecos_tcl_libs}" fi possibles=`echo ${possibles} | sed -e 's,tcl,tk,g'` + { echo "$as_me:$LINENO: looking for tkConfig.sh in ${possibles}" >&5 +echo "$as_me: looking for tkConfig.sh in ${possibles}" >&6;} tkconfig="" for i in ${possibles}; do @@ -4204,14 +4239,24 @@ echo "$as_me: error: ${tclconfig}/tclCon echo "$as_me: error: unable to locate Tk config file tkConfig.sh" >&2;} { (exit 1); exit 1; }; } else + { echo "$as_me:$LINENO: found ${tkconfig}/tkConfig.sh" >&5 +echo "$as_me: found ${tkconfig}/tkConfig.sh" >&6;} . ${tkconfig}/tkConfig.sh if test -n "${TK_INCLUDE_SPEC}" ; then - ecos_tk_includes="${TK_INCLUDE_SPEC}" + ecos_tk_includes="${TK_INCLUDE_SPEC}" + { echo "$as_me:$LINENO: trying TK_INCLUDE_SPEC - looking for tk.h in ${ecos_tk_includes}" >&5 +echo "$as_me: trying TK_INCLUDE_SPEC - looking for tk.h in ${ecos_tk_includes}" >&6;} elif test -n "${TK_INC_DIR}" ; then ecos_tk_includes="${TK_INC_DIR}" + { echo "$as_me:$LINENO: trying TK_INC_DIR - looking for tk.h in ${ecos_tk_includes}" >&5 +echo "$as_me: trying TK_INC_DIR - looking for tk.h in ${ecos_tk_includes}" >&6;} else ecos_tk_includes="-I${TCL_PREFIX}/include" + { echo "$as_me:$LINENO: WARNING: no TK_INCLUDE_SPEC or TK_INC_DIR in tkConfig.sh" >&5 +echo "$as_me: WARNING: no TK_INCLUDE_SPEC or TK_INC_DIR in tkConfig.sh" >&2;} + { echo "$as_me:$LINENO: fallback - looking for tk.h in ${ecos_tk_includes}" >&5 +echo "$as_me: fallback - looking for tk.h in ${ecos_tk_includes}" >&6;} fi ecos_tk_tmpdir=`echo ${ecos_tk_includes} | sed -e "s:-I::g"` if test \! -r "${ecos_tk_tmpdir}/tk.h" ; then @@ -4219,19 +4264,29 @@ echo "$as_me: error: unable to locate Tk echo "$as_me: error: unable to locate Tk header file tk.h" >&2;} { (exit 1); exit 1; }; } else - if test "${ecos_tk_includes}" = "/usr/include" ; then + { echo "$as_me:$LINENO: using ${ecos_tk_includes}" >&5 +echo "$as_me: using ${ecos_tk_includes}" >&6;} + if test "${ecos_tk_includes}" = "-I/usr/include" ; then ecos_tk_includes="" fi fi if test -n "${TK_XINCLUDES}" ; then + { echo "$as_me:$LINENO: adding TK_XINCLUDES ${TK_XINCLUDES}" >&5 +echo "$as_me: adding TK_XINCLUDES ${TK_XINCLUDES}" >&6;} ecos_tk_includes="${ecos_tk_includes} ${TK_XINCLUDES}" fi ecos_tk_libs="" if test -n "${TK_LIB_SPEC}" ; then ecos_tk_libs="${TK_LIB_SPEC}" + { echo "$as_me:$LINENO: trying TK_LIB_SPEC ${TK_LIB_SPEC}" >&5 +echo "$as_me: trying TK_LIB_SPEC ${TK_LIB_SPEC}" >&6;} else + { echo "$as_me:$LINENO: WARNING: no TK_LIB_SPEC in tkConfig.sh" >&5 +echo "$as_me: WARNING: no TK_LIB_SPEC in tkConfig.sh" >&2;} if test "${with_tcl_version+set}" = set ; then + { echo "$as_me:$LINENO: fallback - looking for libtk${with_tcl_version}.a in ${possibles}" >&5 +echo "$as_me: fallback - looking for libtk${with_tcl_version}.a in ${possibles}" >&6;} libtk="" for i in ${possibles}; do @@ -4242,10 +4297,12 @@ echo "$as_me: error: unable to locate Tk done if test -r "${libtk}/libtk${with_tcl_version}.a" ; then - ecos_tk_libs="-L${libtk} -ltk${with_tcl_version}" + ecos_tk_libs="-L${libtk} -ltk${with_tcl_version}" fi fi if test -z "${ecos_tk_libs}" ; then + { echo "$as_me:$LINENO: fallback - looking for libtk.a in ${possibles}" >&5 +echo "$as_me: fallback - looking for libtk.a in ${possibles}" >&6;} libtk="" for i in ${possibles}; do @@ -4264,6 +4321,9 @@ echo "$as_me: error: unable to locate Tk { { echo "$as_me:$LINENO: error: ${tkconfig}/tkConfig.sh does not define TK_LIB_SPEC" >&5 echo "$as_me: error: ${tkconfig}/tkConfig.sh does not define TK_LIB_SPEC" >&2;} { (exit and unable to find libtk.a); exit and unable to find libtk.a; }; } + else + { echo "$as_me:$LINENO: using ${ecos_tk_libs}" >&5 +echo "$as_me: using ${ecos_tk_libs}" >&6;} fi if test -n "${TK_LIBS}" ; then @@ -4273,15 +4333,21 @@ echo "$as_me: error: ${tkconfig}/tkConfi ecos_tk_tmp=`echo ${ecos_tk_tmp} | sed -e "s:${i}::g"` done ecos_tk_libs="${ecos_tk_libs} ${ecos_tk_tmp}" + { echo "$as_me:$LINENO: using additional libraries for Tk ${ecos_tk_tmp}" >&5 +echo "$as_me: using additional libraries for Tk ${ecos_tk_tmp}" >&6;} else ecos_tk_libs="${ecos_tk_libs} ${TK_LIBS}" + { echo "$as_me:$LINENO: using additional libraries for Tk ${TK_LIBS}" >&5 +echo "$as_me: using additional libraries for Tk ${TK_LIBS}" >&6;} fi fi fi fi - { echo "$as_me:$LINENO: result: ${ecos_tcl_incdir} ${TCL_LIB_SPEC}" >&5 -echo "${ECHO_T}${ecos_tcl_incdir} ${TCL_LIB_SPEC}" >&6; } + { echo "$as_me:$LINENO: checking for Tcl/Tk installation" >&5 +echo $ECHO_N "checking for Tcl/Tk installation... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: result: done" >&5 +echo "${ECHO_T}done" >&6; }
--- a/packages/io/usb/slave/current/ChangeLog +++ b/packages/io/usb/slave/current/ChangeLog @@ -1,7 +1,11 @@ +2008-08-20 Bart Veer <bartv@ecoscentric.com> + + * host/configure: regenerate after update of Tcl macro + 2008-08-18 Bart Veer <bartv@ecoscentric.com> * host/Makefile.am, host/configure.in: update host-side configury - * host/Makefiloe.in, host/aclocal.m4, host/config.h.in, + * host/Makefile.in, host/aclocal.m4, host/config.h.in, host/configure, host/stamp-h.in: regenerate. * host/acconfig.h: removed, no longer needed.
--- a/packages/io/usb/slave/current/host/configure +++ b/packages/io/usb/slave/current/host/configure @@ -4109,8 +4109,11 @@ echo "$as_me: error: Failed to identify - { echo "$as_me:$LINENO: checking for Tcl installation" >&5 -echo $ECHO_N "checking for Tcl installation... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: checking for Tcl/Tk installation" >&5 +echo $ECHO_N "checking for Tcl/Tk installation... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: result: " >&5 +echo "${ECHO_T}" >&6; } + # Check whether --with-tcl was given. if test "${with_tcl+set}" = set; then @@ -4206,6 +4209,8 @@ echo "$as_me: error: unable to locate Tc possibles="${possibles} /usr/lib/tcl${with_tcl_version}" possibles="${possibles} /usr/lib/tk${with_tcl_version}" fi + { echo "$as_me:$LINENO: looking for tclConfig.sh in ${possibles}" >&5 +echo "$as_me: looking for tclConfig.sh in ${possibles}" >&6;} tclconfig="" for i in ${possibles}; do @@ -4220,14 +4225,24 @@ echo "$as_me: error: unable to locate Tc echo "$as_me: error: unable to locate Tcl configuration file tclConfig.sh" >&2;} { (exit 1); exit 1; }; } else + { echo "$as_me:$LINENO: found ${tclconfig}/tclConfig.sh" >&5 +echo "$as_me: found ${tclconfig}/tclConfig.sh" >&6;} . ${tclconfig}/tclConfig.sh if test -n "${TCL_INCLUDE_SPEC}" ; then ecos_tcl_incdir="${TCL_INCLUDE_SPEC}" + { echo "$as_me:$LINENO: trying TCL_INCLUDE_SPEC - looking for tcl.h in ${ecos_tcl_incdir}" >&5 +echo "$as_me: trying TCL_INCLUDE_SPEC - looking for tcl.h in ${ecos_tcl_incdir}" >&6;} elif test -n "${TCL_INC_DIR}" ; then ecos_tcl_incdir="${TCL_INC_DIR}" + { echo "$as_me:$LINENO: trying TCL_INC_DIR - looking for tcl.h in ${ecos_tcl_incdir}" >&5 +echo "$as_me: trying TCL_INC_DIR - looking for tcl.h in ${ecos_tcl_incdir}" >&6;} else ecos_tcl_incdir="-I${TCL_PREFIX}/include" + { echo "$as_me:$LINENO: WARNING: no TCL_INCLUDE_SPEC or TCL_INC_DIR in tclConfig.sh" >&5 +echo "$as_me: WARNING: no TCL_INCLUDE_SPEC or TCL_INC_DIR in tclConfig.sh" >&2;} + { echo "$as_me:$LINENO: fallback - looking for tcl.h in ${ecos_tcl_incdir}" >&5 +echo "$as_me: fallback - looking for tcl.h in ${ecos_tcl_incdir}" >&6;} fi ecos_tcl_tmpdir=`echo ${ecos_tcl_incdir} | sed -e "s:-I::g"` if test \! -r "${ecos_tcl_tmpdir}/tcl.h" ; then @@ -4235,7 +4250,9 @@ echo "$as_me: error: unable to locate Tc echo "$as_me: error: unable to locate Tcl header file tcl.h" >&2;} { (exit 1); exit 1; }; } else - if test "${ecos_tcl_incdir}" != "-I/usr/include" ; then + { echo "$as_me:$LINENO: using ${ecos_tcl_incdir}" >&5 +echo "$as_me: using ${ecos_tcl_incdir}" >&6;} + if test "${ecos_tcl_incdir}" != "-I/usr/include" ; then ecos_INCLUDES="${ecos_INCLUDES} ${ecos_tcl_incdir}" fi fi @@ -4243,8 +4260,14 @@ echo "$as_me: error: unable to locate Tc ecos_tcl_libs="" if test -n "${TCL_LIB_SPEC}" ; then ecos_tcl_libs="${ecos_LIBS} ${TCL_LIB_SPEC}" + { echo "$as_me:$LINENO: using TCL_LIB_SPEC ${TCL_LIB_SPEC}" >&5 +echo "$as_me: using TCL_LIB_SPEC ${TCL_LIB_SPEC}" >&6;} else + { echo "$as_me:$LINENO: WARNING: no TCL_LIB_SPEC in tclConfig.sh" >&5 +echo "$as_me: WARNING: no TCL_LIB_SPEC in tclConfig.sh" >&2;} if test "${with_tcl_version+set}" = set ; then + { echo "$as_me:$LINENO: fallback - looking for libtcl${with_tcl_version}.a in ${possibles}" >&5 +echo "$as_me: fallback - looking for libtcl${with_tcl_version}.a in ${possibles}" >&6;} libtcl="" for i in ${possibles}; do @@ -4256,9 +4279,13 @@ echo "$as_me: error: unable to locate Tc if test -r "${libtcl}/libtcl${with_tcl_version}.a" ; then ecos_tcl_libs="-L${libtcl} -ltcl${with_tcl_version}" + { echo "$as_me:$LINENO: using ${ecos_tcl_libs}" >&5 +echo "$as_me: using ${ecos_tcl_libs}" >&6;} fi fi if test -z "${ecos_tcl_libs}" ; then + { echo "$as_me:$LINENO: fallback - looking for libtcl.a in ${possibles}" >&5 +echo "$as_me: fallback - looking for libtcl.a in ${possibles}" >&6;} libtcl="" for i in ${possibles}; do @@ -4270,27 +4297,35 @@ echo "$as_me: error: unable to locate Tc if test -r "${libtcl}/libtcl.a" ; then ecos_tcl_libs="-L${libtcl} -ltcl" + { echo "$as_me:$LINENO: using ${ecos_tcl_libs}" >&5 +echo "$as_me: using ${ecos_tcl_libs}" >&6;} fi fi fi if test -z "${ecos_tcl_libs}" ; then - { { echo "$as_me:$LINENO: error: ${tclconfig}/tclConfig.sh does not define TCL_LIB_SPEC" >&5 + { { echo "$as_me:$LINENO: error: ${tclconfig}/tclConfig.sh does not define TCL_LIB_SPEC" >&5 echo "$as_me: error: ${tclconfig}/tclConfig.sh does not define TCL_LIB_SPEC" >&2;} { (exit and unable to find libtcl.a); exit and unable to find libtcl.a; }; } fi if test -n "${TCL_LIBS}" ; then ecos_tcl_libs="${ecos_tcl_libs} ${TCL_LIBS}" + { echo "$as_me:$LINENO: using additional libraries for Tcl ${TCL_LIBS}" >&5 +echo "$as_me: using additional libraries for Tcl ${TCL_LIBS}" >&6;} fi if test -n "${TCL_LD_FLAGS}" ; then ecos_tcl_libs="${ecos_tcl_libs} ${TCL_LD_FLAGS}" + { echo "$as_me:$LINENO: using additional linker flags for Tcl ${TCL_LD_FLAGS}" >&5 +echo "$as_me: using additional linker flags for Tcl ${TCL_LD_FLAGS}" >&6;} fi ecos_LIBS="${ecos_LIBS} ${ecos_tcl_libs}" fi possibles=`echo ${possibles} | sed -e 's,tcl,tk,g'` + { echo "$as_me:$LINENO: looking for tkConfig.sh in ${possibles}" >&5 +echo "$as_me: looking for tkConfig.sh in ${possibles}" >&6;} tkconfig="" for i in ${possibles}; do @@ -4305,14 +4340,24 @@ echo "$as_me: error: ${tclconfig}/tclCon echo "$as_me: error: unable to locate Tk config file tkConfig.sh" >&2;} { (exit 1); exit 1; }; } else + { echo "$as_me:$LINENO: found ${tkconfig}/tkConfig.sh" >&5 +echo "$as_me: found ${tkconfig}/tkConfig.sh" >&6;} . ${tkconfig}/tkConfig.sh if test -n "${TK_INCLUDE_SPEC}" ; then - ecos_tk_includes="${TK_INCLUDE_SPEC}" + ecos_tk_includes="${TK_INCLUDE_SPEC}" + { echo "$as_me:$LINENO: trying TK_INCLUDE_SPEC - looking for tk.h in ${ecos_tk_includes}" >&5 +echo "$as_me: trying TK_INCLUDE_SPEC - looking for tk.h in ${ecos_tk_includes}" >&6;} elif test -n "${TK_INC_DIR}" ; then ecos_tk_includes="${TK_INC_DIR}" + { echo "$as_me:$LINENO: trying TK_INC_DIR - looking for tk.h in ${ecos_tk_includes}" >&5 +echo "$as_me: trying TK_INC_DIR - looking for tk.h in ${ecos_tk_includes}" >&6;} else ecos_tk_includes="-I${TCL_PREFIX}/include" + { echo "$as_me:$LINENO: WARNING: no TK_INCLUDE_SPEC or TK_INC_DIR in tkConfig.sh" >&5 +echo "$as_me: WARNING: no TK_INCLUDE_SPEC or TK_INC_DIR in tkConfig.sh" >&2;} + { echo "$as_me:$LINENO: fallback - looking for tk.h in ${ecos_tk_includes}" >&5 +echo "$as_me: fallback - looking for tk.h in ${ecos_tk_includes}" >&6;} fi ecos_tk_tmpdir=`echo ${ecos_tk_includes} | sed -e "s:-I::g"` if test \! -r "${ecos_tk_tmpdir}/tk.h" ; then @@ -4320,19 +4365,29 @@ echo "$as_me: error: unable to locate Tk echo "$as_me: error: unable to locate Tk header file tk.h" >&2;} { (exit 1); exit 1; }; } else - if test "${ecos_tk_includes}" = "/usr/include" ; then + { echo "$as_me:$LINENO: using ${ecos_tk_includes}" >&5 +echo "$as_me: using ${ecos_tk_includes}" >&6;} + if test "${ecos_tk_includes}" = "-I/usr/include" ; then ecos_tk_includes="" fi fi if test -n "${TK_XINCLUDES}" ; then + { echo "$as_me:$LINENO: adding TK_XINCLUDES ${TK_XINCLUDES}" >&5 +echo "$as_me: adding TK_XINCLUDES ${TK_XINCLUDES}" >&6;} ecos_tk_includes="${ecos_tk_includes} ${TK_XINCLUDES}" fi ecos_tk_libs="" if test -n "${TK_LIB_SPEC}" ; then ecos_tk_libs="${TK_LIB_SPEC}" + { echo "$as_me:$LINENO: trying TK_LIB_SPEC ${TK_LIB_SPEC}" >&5 +echo "$as_me: trying TK_LIB_SPEC ${TK_LIB_SPEC}" >&6;} else + { echo "$as_me:$LINENO: WARNING: no TK_LIB_SPEC in tkConfig.sh" >&5 +echo "$as_me: WARNING: no TK_LIB_SPEC in tkConfig.sh" >&2;} if test "${with_tcl_version+set}" = set ; then + { echo "$as_me:$LINENO: fallback - looking for libtk${with_tcl_version}.a in ${possibles}" >&5 +echo "$as_me: fallback - looking for libtk${with_tcl_version}.a in ${possibles}" >&6;} libtk="" for i in ${possibles}; do @@ -4343,10 +4398,12 @@ echo "$as_me: error: unable to locate Tk done if test -r "${libtk}/libtk${with_tcl_version}.a" ; then - ecos_tk_libs="-L${libtk} -ltk${with_tcl_version}" + ecos_tk_libs="-L${libtk} -ltk${with_tcl_version}" fi fi if test -z "${ecos_tk_libs}" ; then + { echo "$as_me:$LINENO: fallback - looking for libtk.a in ${possibles}" >&5 +echo "$as_me: fallback - looking for libtk.a in ${possibles}" >&6;} libtk="" for i in ${possibles}; do @@ -4365,6 +4422,9 @@ echo "$as_me: error: unable to locate Tk { { echo "$as_me:$LINENO: error: ${tkconfig}/tkConfig.sh does not define TK_LIB_SPEC" >&5 echo "$as_me: error: ${tkconfig}/tkConfig.sh does not define TK_LIB_SPEC" >&2;} { (exit and unable to find libtk.a); exit and unable to find libtk.a; }; } + else + { echo "$as_me:$LINENO: using ${ecos_tk_libs}" >&5 +echo "$as_me: using ${ecos_tk_libs}" >&6;} fi if test -n "${TK_LIBS}" ; then @@ -4374,15 +4434,21 @@ echo "$as_me: error: ${tkconfig}/tkConfi ecos_tk_tmp=`echo ${ecos_tk_tmp} | sed -e "s:${i}::g"` done ecos_tk_libs="${ecos_tk_libs} ${ecos_tk_tmp}" + { echo "$as_me:$LINENO: using additional libraries for Tk ${ecos_tk_tmp}" >&5 +echo "$as_me: using additional libraries for Tk ${ecos_tk_tmp}" >&6;} else ecos_tk_libs="${ecos_tk_libs} ${TK_LIBS}" + { echo "$as_me:$LINENO: using additional libraries for Tk ${TK_LIBS}" >&5 +echo "$as_me: using additional libraries for Tk ${TK_LIBS}" >&6;} fi fi fi fi - { echo "$as_me:$LINENO: result: ${ecos_tcl_incdir} ${TCL_LIB_SPEC}" >&5 -echo "${ECHO_T}${ecos_tcl_incdir} ${TCL_LIB_SPEC}" >&6; } + { echo "$as_me:$LINENO: checking for Tcl/Tk installation" >&5 +echo $ECHO_N "checking for Tcl/Tk installation... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: result: done" >&5 +echo "${ECHO_T}done" >&6; }
