# HG changeset patch # User jld # Date 1044285551 0 # Node ID 153384f24406d62157fa474c5160a2b02576f0b2 # Parent 6df74e828d35cbb560495dcf016a5c1057bf86eb * configure: revert unintentional change diff --git a/host/libcdl/configure b/host/libcdl/configure --- a/host/libcdl/configure +++ b/host/libcdl/configure @@ -1471,7 +1471,6 @@ echo "configure:1470: checking "for Visu if test "${CC}" = "cl" ; then MSVC="yes" CXX="cl" - MSVC_SRCDIR=${srcdir} @@ -1480,7 +1479,7 @@ echo "configure:1470: checking "for Visu fi - ecos_INCLUDES="${ecos_INCLUDES} \"-I${MSVC_SRCDIR}\"" + ecos_INCLUDES="${ecos_INCLUDES} \"-I${msvc_srcdir}\"" ecos_LDADD="-link" ecos_LIBS="advapi32.lib" fi @@ -1771,7 +1770,7 @@ fi { echo "configure: error: infrastructure headers not found" 1>&2; exit 1; } fi if test "${MSVC}" = "yes" ; then - ecos_msvc_infra_incdir=${ecos_infra_incdir} + ecos_msvc_infra_incdir = ${ecos_infra_incdir} @@ -1944,7 +1943,7 @@ fi { echo "configure: error: unable to locate Tcl config file tclConfig.sh" 1>&2; exit 1; } else . ${ecos_tcl_libdir}/tclConfig.sh - ecos_LIBS="${ecos_LIBS} ${TCL_LIB_FLAG} ${TCL_LIBS}" + ecos_LIBS="${ecos_LIBS} -ltcl${ecos_tcl_version} ${TCL_LIBS}" ecos_LDADD="${ecos_LDADD} -L${ecos_tcl_libdir}" fi @@ -1963,7 +1962,7 @@ fi { echo "configure: error: unable to locate Tk config file tkConfig.sh" 1>&2; exit 1; } else . ${ecos_tk_libdir}/tkConfig.sh - ecos_tk_libs="-L${ecos_tk_libdir} ${TK_LIB_FLAG} ${TK_LIBS}" + ecos_tk_libs="-L${ecos_tk_libdir} -ltk${ecos_tcl_version} ${TK_LIBS}" for lib in ${TCL_LIBS} ; do ecos_tk_libs=`echo ${ecos_tk_libs} | sed -e "s!${lib}!!"` done