Mercurial > flash_v2
changeset 595:c2d1fd823f09
Update autoconf macro for Tcl, and regenerate affected files
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-02-12 Bart Veer <bartv@ecoscentric.com> + + * README.host: update Tcl-related instructions + + * Makefile.in: regenerate + 2002-08-13 Bart Veer <bartv@ecoscentric.com> * README.host: update host-side build instructions
--- a/Makefile.in +++ b/Makefile.in @@ -102,6 +102,7 @@ ecos_infra_incdir = @ecos_infra_incdir@ ecos_infra_libdir = @ecos_infra_libdir@ ecos_libcdl_incdir = @ecos_libcdl_incdir@ ecos_libcdl_libdir = @ecos_libcdl_libdir@ +ecos_tk_includes = @ecos_tk_includes@ ecos_tk_libs = @ecos_tk_libs@ AUTOMAKE_OPTIONS = 1.3 foreign
--- a/README.host +++ b/README.host @@ -78,8 +78,8 @@ of sources, and where a package does hav package documentation should be consulted for further information. -Installing on Linux and Other Unix Systems ------------------------------------------- +Installing on Linux, Other Unix Systems, and Cygwin +--------------------------------------------------- Both generic host-side software (infra, libcdl and ecosconfig) and package-specific software can be built with the conventional @@ -185,48 +185,81 @@ 2) --enable-debug. By default all assert --disable-fntracing disable function entry/exit tracing 3) --with-tcl=<path> - --with-tcl-header=<path> - --with-tcl-lib=<path> --with-tcl-version=<number> The host-side tools have a dependency on Tcl, which is not supplied with the sources because many people will already have a suitable installation. Specifically it is necessary to have the header file tcl.h and appropriate libraries such that -ltcl will work - this - can involve either static or shared libraries. + can involve either static or shared libraries. Some tools may require + Tk as well as Tcl. + + Unfortunately there is considerable variation in Tcl installations. + In theory all Tcl installations have a file tclConfig.sh which + defines exactly how to compile and link code that uses Tcl, and Tk + has a similar file tkConfig.sh. The eCos configure scripts look for + these files, first in $(prefix)/lib, then in /usr/lib. If the system + already has a Tcl installation in /usr then the configure script will + automatically find /usr/lib/tclConfig.sh and it is not necessary + to pass additional options when configuring the eCos host-side + software. Alternatively, if for example you have installed a more + recent version of Tcl/Tk in the same place that you want to install the + eCos software, e.g. /usr/local, then $(prefix)/lib/tclConfig.sh + will be read in. - By default the configure script will assume that there is a - suitable Tcl installation in the install location, so if there is - no --prefix argument then it will look for /usr/local/include/tcl.h - and it will add -L/usr/local/lib to the library search path. If - Tcl is installed elsewhere then this can be specified with a - --with-tcl option. For example, if the default installation in - /usr should be used then the following configure option is - appropriate: + It is also possible that a more recent version of Tcl has been installed + in a different location. For example, you may wish to install the eCos host + tools in /opt/ecos but use a version of Tcl installed in /usr/local. The + eCos configure scripts need to be told explicitly where to look for + the Tcl: + + $ <path>/configure --with-tcl=/usr/local ... - $ <path>/configure --with-tcl=/usr <args> + Some systems, for example Debian Linux 3.0, do not install tclConfig.sh + in /usr/lib because that makes it more difficult to have several different + versions of Tcl installed at the same time. Instead tclConfig.sh is found + in a versioned directory such as /usr/lib/tcl8.3. Since several versions + may be installed the desired one must be specified explicitly. + + $ <path>/configure --with-tcl-version=8.3 + + The --with-tcl and --with-tcl-version options are combined to give a search path: - If the Tcl libraries and Tcl headers are installed in different - locations, such as when a separate --prefix and --exec-prefix are - used, the --with-tcl-header and --with-tcl-lib options can be used - to specify both location. The configure script will expect to find - <tcl-header-dir>/include/tcl.h and <tcl-lib-dir>/lib/tclConfig.sh. - The --with-tcl option has precedence and if used will override the - --with-tcl-header and --with-tcl-lib options. + <with>/lib/tclConfig.sh + <with>/lib/tcl<vsn>/tclConfig.sh + <prefix>/lib/tclConfig.sh + <prefix>/lib/tcl<vsn>/tclConfig.sh + /usr/lib/tclConfig.sh + /usr/lib/tcl<vsn>/tclConfig.sh + + If tclConfig.sh cannot be found in any of these places then it is assumed + that Tcl has not been properly installed and the eCos configure script will + fail. The --with-tcl and --with-tcl-version are also used to give a search + path for tkConfig.sh - It is possible to have multiple versions of Tcl installed, for - example libtcl8.0.a, libtcl8.1.a, and so on. Typically linking with - -ltcl will result in the latest version being used. It is possible - to specify a different version using --with-tcl-version, e.g.: + <with>/lib/tkConfig.sh + <with>/lib/tk<vsn>/tkConfig.sh + <prefix>/lib/tkConfig.sh + <prefix>/lib/tk<vsn>/tkConfig.sh + /usr/lib/tkConfig.sh + /usr/lib/tk<vsn>/tkConfig.sh - $ <path>configure --with-tcl=/usr/local/scriptics --with-tcl-version=8.1 <args> + Again, the configure scripts must be able to find tkConfig.sh - It may be necessary to specify --with-tcl-version if there are - multiple installs in different locations. For example the - system may have a default install in /usr and a more up to date - install in /usr/local/tcl8.4. To use the latter it will usually - be necessary to specify both --with-tcl=/usr/local/tcl8.4 and - --with-tcl-version=8.4. + Once tclConfig.sh and tkConfig.sh have been found and read in, the eCos + configure scripts should have all the information needed to compile and + link code that uses Tcl. First the location of key headers such as + <tcl.h> is needed. A tclConfig.sh file may define TCL_INC_DIR to give + a specific location, otherwise the header files should be in + $(TCL_PREFIX)/include. If <tcl.h> cannot be found then the eCos configure + scripts will fail. + + Next it is necessary to work out how to link applications with Tcl. This + information should be provided by a tclConfig.sh variable TCL_LIB_SPEC. + Unfortunately not all Tcl installations set this, for example the cygwin + Tcl 8.4 release. If TCL_LIB_SPEC is not defined then instead the + configure script will look for a library libtcl<vsn>.a, where <vsn> is + specified using --with-tcl-version, then for a library libtcl.a Following the configure step the build tree should be set up correctly. All that remains is the actual build and install: @@ -242,28 +275,6 @@ has special installation requirements, f to be installed suid root, and this will also need root privileges. -Installing under Cygwin ------------------------ - -Installing under cygwin requires essentially the same steps as -under Linux. It is more likely that a suitable --prefix option will -have to be used, and that the location of the Tcl installation needs -to be specified with --with-tcl. However appropriate use of cygwin -mount points may avoid some of these problems. If the full path to -the configure script contains spaces, then the short form of the path -should be used when invoking configure. - -One issue to be aware of is the naming convention for the Tcl library. -On a Unix system this will typically be called libtcl8.3.a (adjusted -according to the version number), with a symbolic link from libtcl.a -to the most recent version. Under cygwin the equivalent library is -called libtcl80.a, and symbolic links are not used. For a standard -cygwin installation the configure script knows how to pick up the -appropriate library, but if a more recent version of Tcl has been -installed then due care has to be taken with the --with-tcl-version -option. - - Installing with Visual C++ --------------------------
--- a/acsupport/ChangeLog +++ b/acsupport/ChangeLog @@ -1,3 +1,8 @@ +2003-02-12 Bart Veer <bartv@ecoscentric.com> + + * acinclude.m4: Another attempt at the Tcl macro, to cope with + cygwin tcl 8.3 and 8.4. Also fix some problems with VC++ builds. + 2002-10-27 Bart Veer <bartv@ecoscentric.com> * acinclude.m4 (ECOS_PATH_TCL): fix typo that prevented a build @@ -23,7 +28,7 @@ 2002-08-03 Bart Veer <bartv@ecoscentri //####COPYRIGHTBEGIN#### // // ---------------------------------------------------------------------------- -// Copyright (C) 2002 Bart Veer +// Copyright (C) 2002, 2003 Bart Veer // // This file is part of the eCos autoconf support. //
--- a/acsupport/acinclude.m4 +++ b/acsupport/acinclude.m4 @@ -10,7 +10,7 @@ dnl dnl ==================================================================== dnl ####ECOSHOSTGPLCOPYRIGHTBEGIN#### dnl ---------------------------------------------------------------------------- -dnl Copyright (C) 2002 Bart Veer +dnl Copyright (C) 2002, 2003 Bart Veer dnl Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc. dnl dnl This file is part of the eCos host tools. @@ -126,9 +126,10 @@ AC_DEFUN(ECOS_PROG_MSVC,[ if test "${CC}" = "cl" ; then MSVC="yes" CXX="cl" + MSVC_SRCDIR=${srcdir} ECOS_MSVC_PATH(MSVC_SRCDIR) AC_SUBST(MSVC_SRCDIR) - ecos_INCLUDES="${ecos_INCLUDES} \"-I${msvc_srcdir}\"" + ecos_INCLUDES="${ecos_INCLUDES} \"-I${MSVC_SRCDIR}\"" ecos_LDADD="-link" ecos_LIBS="advapi32.lib" fi @@ -365,6 +366,29 @@ AC_DEFUN(AC_FIND_DIR,[ dnl ==================================================================== dnl Work out details of the Tcl/tk installation that should be used. +dnl In theory this is simple: when Tcl is installed in <tcl_prefix> +dnl (usually /usr) there should be a file <tcl_prefix>/lib/tclConfig.sh +dnl which defines exactly how to build Tcl-based applications. Of course +dnl Tcl may be installed anywhere, not just in /usr, so it is necessary +dnl to do some searching. There is a command-line argument +dnl --with-tcl=<path> to specify the Tcl installation, so the macro +dnl can search for <with_tcl>/lib/tclConfig.sh, <prefix>/lib/tclConfig.sh +dnl and /usr/lib/tclConfig.sh +dnl +dnl Unfortunately not all systems use this convention. For example, +dnl at the time of writing Debian installs tclConfig.sh in a versioned +dnl subdirectory /usr/lib/tcl8.3/tclConfig.sh. Hence there is an +dnl additional argument --with-tcl-version=<vsn> which is used to +dnl extend the search path. +dnl +dnl For VC++ builds the situation is different again. Tcl may be +dnl installed anywhere, so the data in tclConfig.sh is not useful +dnl (and that file may not be provided at all). Instead --with-tcl +dnl must be used to specify the path. Alternatively separate paths +dnl for headers and libraries can be specified using --with-tcl-header +dnl and --with-tcl-lib. Usually it will also be necessary to specify +dnl the library version number using --with-tcl-version. + dnl This adds two main command-line options, --with-tcl=<prefix> to dnl specify the Tcl install directory, and --with-tcl-version=<vsn> dnl to control which version of Tcl should be used. For finer-grained @@ -401,37 +425,13 @@ AC_DEFUN(ECOS_PATH_TCL, [ AC_REQUIRE([ECOS_PROG_MSVC]) AC_REQUIRE([AC_CYGWIN]) - ecos_tcl_version="" - ecos_tcl_incdir="" - ecos_tcl_libdir="" ecos_tk_libs="" ecos_tk_libdir="" - dnl Look for the version of Tcl. If none is specified, default to - dnl 8.0 under VC++ and cygwin, nothing under Unix. A version has to be - dnl specified under NT because there is no symbolic link from libtcl.a - dnl to whatever happens to be the most recent installed version. - - AC_MSG_CHECKING([for Tcl version]) - AC_ARG_WITH(tcl-version,[ --with-tcl-version=<vsn> version of Tcl to be used],[ - ecos_tcl_version=${with_tcl_version} - ],[ - if test "${MSVC}" = "yes" ; then - ecos_tcl_version=80 - elif test "${ac_cv_cygwin}" = "yes" ; then - ecos_tcl_version=80 - else - ecos_tcl_version="" - fi - ]) - AC_MSG_RESULT([${ecos_tcl_version}]) - - dnl Where is the Tcl installation? + dnl Where is the Tcl installation, and what version should be used? AC_MSG_CHECKING(for Tcl installation) - - AC_ARG_WITH(tcl-header,[ --with-tcl-header=<path> location of Tcl header]) - AC_ARG_WITH(tcl-lib,[ --with-tcl-lib=<path> location of Tcl libraries]) 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]) dnl If using VC++ then there are no sensible default directories dnl to search for a Tcl installation. Instead the user must @@ -441,9 +441,14 @@ AC_DEFUN(ECOS_PATH_TCL, [ dnl Also when using VC++ there is no tclConfig.sh file to dnl consult about which libraries are needed. Instead that dnl information is hard-wired here. - if test "${MSVC}" = "yes" ; then - + AC_ARG_WITH(tcl-header,[ --with-tcl-header=<path> location of Tcl header]) + AC_ARG_WITH(tcl-lib,[ --with-tcl-lib=<path> location of Tcl libraries]) + ecos_tcl_incdir="" + ecos_tcl_libdir="" + if test "${with_tcl_version+set}" != set ; then + AC_MSG_ERROR(You must specify a Tcl version using --with-tcl-version=<vsn>) + fi if test "${with_tcl_header+set}" = set ; then ecos_tcl_incdir=${with_tcl_header} elif test "${with_tcl+set}" = set ; then @@ -451,16 +456,6 @@ AC_DEFUN(ECOS_PATH_TCL, [ else AC_MSG_ERROR(You must specify a Tcl installation with either --with-tcl=<path> or --with-tcl-header=<path>) fi - - dnl Sanity check, make sure that there is a tcl.h header file. - dnl If not then there is no point in proceeding. - if test \! -r "${ecos_tcl_incdir}/tcl.h" ; then - AC_MSG_ERROR([unable to locate Tcl header file tcl.h]) - fi - ecos_msvc_tcl_incdir="${ecos_tcl_incdir}" - ECOS_MSVC_PATH(ecos_msvc_tcl_incdir) - ecos_INCLUDES="${ecos_INCLUDES} \"-I${ecos_msvc_tcl_incdir}\"" - if test "${with_tcl_lib+set}" = set; then ecos_tcl_libdir=${with_tcl_lib} elif test "${with_tcl+set}" = set; then @@ -468,8 +463,17 @@ AC_DEFUN(ECOS_PATH_TCL, [ else AC_MSG_ERROR(You must specify a Tcl installation with either --with-tcl=<path> or --with-tcl-lib=<path>) fi + + dnl Sanity check, make sure that there is a tcl.h header file. + dnl If not then there is no point in proceeding. + if test \! -r "${ecos_tcl_incdir}/tcl.h" ; then + AC_MSG_ERROR([unable to locate Tcl header file tcl.h]) + fi + + ECOS_MSVC_PATH(ecos_tcl_incdir) ECOS_MSVC_PATH(ecos_tcl_libdir) - ecos_LIBS="${ecos_LIBS} tcl${ecos_tcl_version}.lib" + ecos_INCLUDES="${ecos_INCLUDES} \"-I${ecos_tcl_incdir}\"" + ecos_LIBS="${ecos_LIBS} tcl${with_tcl_version}.lib" ecos_LDADD="${ecos_LDADD} \"-libpath=${ecos_tcl_libdir}\"" dnl FIXME: what libraries are needed for a tk application under VC++? @@ -477,64 +481,110 @@ AC_DEFUN(ECOS_PATH_TCL, [ ecos_tk_libs="" else - dnl Depending on the installation there are a number of reasonable locations for tcl.h - dnl so this code performs a search. - possibles="${with_tcl_header} ${with_tcl}/include ${prefix}/include /usr/include/tcl${ecos_tcl_version} /usr/include" - AC_FIND_FILE("tcl.h", ${possibles}, ecos_tcl_incdir) - if test \! -r "${ecos_tcl_incdir}/tcl.h" ; then - AC_MSG_ERROR(unable to locate Tcl header file tcl.h) - else - dnl On Unix systems -I/usr/include is unnecessary, and can cause problems on hosts - dnl where gcc is not the platform's default compiler because of the use of - dnl unfixed headers. Hence it is explicitly removed here. Similarly - dnl -I/usr/lib serves no purpose, although it should be harmless. - dnl Under cygwin this check may be wrong, should the mount table - dnl be set up such that /usr/include points at the main cygwin - dnl headers. That assumes that gcc under cygwin does not have - dnl /usr/include in its default path, an untested assumption. - if test "${ecos_tcl_incdir}" != "/usr/include" ; then - ecos_INCLUDES="${ecos_INCLUDES} -I${ecos_tcl_incdir}" - fi + dnl Try to find tclConfig.sh + possibles="" + if test "${with_tcl+set}" = set ; then + possibles="${with_tcl}/lib" + if test "${with_tcl_version+set}" = set ; then + possibles="${possibles} ${with_tcl}/lib/tcl${with_tcl_version}" + fi fi - possibles="${with_tcl_lib} ${with_tcl}/lib ${libdir} ${prefix}/lib /usr/lib/tcl${ecos_tcl_version} /usr/lib" - AC_FIND_FILE("tclConfig.sh", ${possibles}, ecos_tcl_libdir) - if test \! -r "${ecos_tcl_libdir}/tclConfig.sh" ; then - AC_MSG_ERROR(unable to locate Tcl config file tclConfig.sh) - else - . ${ecos_tcl_libdir}/tclConfig.sh - dnl Arguably if ecos_tcl_version is not set then it should be - dnl here using TCL_VERSION, tying executables to a specific - dnl release. That avoids problems if the system has multiple - dnl Tcl installations, e.g. the system install plus a more - dnl recent private install. However it would introduce a - dnl problem if the system install gets upgraded, executables - dnl would still try to use the old version and would need - dnl to be rebuilt. - dnl - dnl For now, do not set ecos_tcl_version automatically. The - dnl user can override this. - ecos_LIBS="${ecos_LIBS} -ltcl${ecos_tcl_version} ${TCL_LIBS}" - ecos_LDADD="${ecos_LDADD} -L${ecos_tcl_libdir}" - fi + possibles="${possibles} ${prefix}/lib" + if test "${with_tcl_version+set}" = set ; then + possibles="${possibles} ${prefix}/lib/tcl${with_tcl_version}" + fi + possibles="${possibles} /usr/lib" + if test "${with_tcl_version+set}" = set ; then + possibles="${possibles} /usr/lib/tcl${with_tcl_version}" + fi + 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 + . ${tclconfig}/tclConfig.sh + + dnl Now we need to figure out where to find the Tcl header files. + dnl tclConfig.sh may define a variable TCL_INC_DIR, otherwise + dnl use TCL_PREFIX/include + if test -z "${TCL_INC_DIR}" ; then + ecos_tcl_incdir="${TCL_PREFIX}/include" + else + ecos_tcl_incdir="${TCL_INC_DIR}" + fi + if test \! -r "${ecos_tcl_incdir}/tcl.h" ; then + AC_MSG_ERROR(unable to locate Tcl header file tcl.h) + else + dnl On Unix systems -I/usr/include is unnecessary, and can + 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_tcl_incdir}" != "/usr/include" ; then + ecos_INCLUDES="${ecos_INCLUDES} -I${ecos_tcl_incdir}" + fi + fi - 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_tk_libdir}/tkConfig.sh - ecos_tk_libs="-L${ecos_tk_libdir} -ltk${ecos_tcl_version} ${TK_LIBS}" - dnl Remove any library duplicates. It is not quite clear why, - dnl but they seem to cause problems. - for lib in ${TCL_LIBS} ; do - ecos_tk_libs=`echo ${ecos_tk_libs} | sed -e "s!${lib}!!"` - done - fi + dnl There should be a variable TCL_LIB_SPEC which defines + dnl exactly how to link with Tcl. Unfortunately this is not + dnl 100% guaranteed, so a backup solution is still needed. + dnl NOTE: there is also TCL_LIBS defining additional libraries + dnl such as -ldl. That may have to be added to ecos_LIBS. + if test -z "${TCL_LIB_SPEC}" -a "${with_tcl_version+set}" = set ; then + AC_FIND_FILE("libtcl${with_tcl_version}.a", ${possibles}, libtcl) + if test -r "${libtcl}/libtcl${with_tcl_version}.a" ; then + TCL_LIB_SPEC="-L${libtcl} -ltcl${with_tcl_version}" + fi + fi + if test -z "${TCL_LIB_SPEC}" ; then + AC_FIND_FILE("libtcl.a", ${possibles}, libtcl) + if test -r "${libtcl}/libtcl.a" ; then + TCL_LIB_SPEC="-L${libtcl} -ltcl" + fi + fi + if test -z "${TCL_LIB_SPEC}" ; then + AC_MSG_ERROR(${tclconfig}/tclConfig.sh does not define TCL_LIB_SPEC, and unable to find libtcl.a) + fi + ecos_LIBS="${ecos_LIBS} ${TCL_LIB_SPEC}" + + dnl Next, look for tkConfig.sh + possibles=`echo ${possibles} | sed -e 's,tcl,tk,g'` + 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 + . ${tkconfig}/tkConfig.sh + if test -z "${TK_INC_DIR}" ; then + if test "${TK_PREFIX}" = "/usr" ; then + ecos_tk_includes="${TK_XINCLUDES}" + else + ecos_tk_includes="-I${TK_PREFIX}/include ${TK_XINCLUDES}" + fi + else + ecos_tk_includes="-I${TK_INC_DIR} ${TK_XINCLUDES}" + fi + + dnl As with TCL_LIB_SPEC, TK_LIB_SPEC may be empty + if test -z "${TK_LIB_SPEC}" -a "${with_tcl_version+set}" = set ; then + AC_FIND_FILE("libtk${with_tcl_version}.a", ${possibles}, libtk) + if test -r "${libtk}/libtk${with_tcl_version}.a" ; then + TK_LIB_SPEC="-L${libtk} -ltk${with_tcl_version}" + fi + fi + if test -z "${TK_LIB_SPEC}" ; then + AC_FIND_FILE("libtk.a", ${possibles}, libtk) + if test -r "${libtk}/libtk.a" ; then + TK_LIB_SPEC="-L${libtk} -ltk" + fi + fi + if test -z "${TK_LIB_SPEC}" ; then + AC_MSG_ERROR(${tkconfig}/tkConfig.sh does not define TK_LIB_SPEC, and unable to find libtk.a) + fi + ecos_tk_libs="${TK_LIB_SPEC} ${TK_LIBS}" + fi + fi fi - AC_MSG_RESULT([-I${ecos_tcl_incdir} -L${ecos_tcl_libdir}]) - + AC_MSG_RESULT([-I${ecos_tcl_incdir} ${TCL_LIB_SPEC}]) + AC_SUBST(ecos_tk_includes) AC_SUBST(ecos_tk_libs) ]) @@ -585,7 +635,7 @@ AC_DEFUN(ECOS_PATH_INFRA, [ AC_MSG_ERROR([infrastructure headers not found]) fi if test "${MSVC}" = "yes" ; then - ecos_msvc_infra_incdir = ${ecos_infra_incdir} + ecos_msvc_infra_incdir=${ecos_infra_incdir} ECOS_MSVC_PATH(ecos_msvc_infra_incdir) ecos_INCLUDES="${ecos_INCLUDES} \"-I${ecos_msvc_infra_incdir}\"" else @@ -668,7 +718,7 @@ AC_DEFUN(ECOS_PATH_LIBCDL, [ AC_MSG_ERROR([libcdl headers not found]) fi if test "${MSVC}" = "yes" ; then - ecos_msvc_libcdl_incdir = "${ecos_libcdl_incdir}" + ecos_msvc_libcdl_incdir="${ecos_libcdl_incdir}" ECOS_MSVC_PATH(ecos_msvc_libcdl_incdir) ecos_INCLUDES="${ecos_INCLUDES} \"-I${ecos_msvc_libcdl_incdir}\"" else
--- a/host/ChangeLog +++ b/host/ChangeLog @@ -1,3 +1,7 @@ +2003-02-12 Bart Veer <bartv@ecoscentric.com> + + * Makefile.in: Regenerate after acinclude.m4 update + 2002-08-03 Bart Veer <bartv@ecoscentric.com> * acinclude.m4, configure.in, Makefile.am:
--- a/host/Makefile.in +++ b/host/Makefile.in @@ -84,6 +84,7 @@ ecos_infra_incdir = @ecos_infra_incdir@ ecos_infra_libdir = @ecos_infra_libdir@ ecos_libcdl_incdir = @ecos_libcdl_incdir@ ecos_libcdl_libdir = @ecos_libcdl_libdir@ +ecos_tk_includes = @ecos_tk_includes@ ecos_tk_libs = @ecos_tk_libs@ AUTOMAKE_OPTIONS = 1.3 foreign
--- a/host/infra/ChangeLog +++ b/host/infra/ChangeLog @@ -1,3 +1,8 @@ +2003-02-12 Bart Veer <bartv@ecoscentric.com> + + * Makefile.in, configure, testsuite/Makefile.in: + Regenerate after acinclude.m4 update + 2002-08-03 Bart Veer <bartv@ecoscentric.com> * acinclude.m4, configure.in, Makefile.am, testsuite/Makefile.am:
--- a/host/infra/Makefile.in +++ b/host/infra/Makefile.in @@ -106,6 +106,7 @@ ecos_infra_incdir = @ecos_infra_incdir@ ecos_infra_libdir = @ecos_infra_libdir@ ecos_libcdl_incdir = @ecos_libcdl_incdir@ ecos_libcdl_libdir = @ecos_libcdl_libdir@ +ecos_tk_includes = @ecos_tk_includes@ ecos_tk_libs = @ecos_tk_libs@ AUTOMAKE_OPTIONS = 1.3 foreign
--- a/host/infra/configure +++ b/host/infra/configure @@ -1440,6 +1440,7 @@ echo "configure:1439: checking "for Visu if test "${CC}" = "cl" ; then MSVC="yes" CXX="cl" + MSVC_SRCDIR=${srcdir} @@ -1448,7 +1449,7 @@ echo "configure:1439: 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 @@ -1474,7 +1475,7 @@ fi echo $ac_n "checking "the default compiler flags"""... $ac_c" 1>&6 -echo "configure:1478: checking "the default compiler flags"" >&5 +echo "configure:1479: checking "the default compiler flags"" >&5 ecosflags_enable_debug="no" # Check whether --enable-debug or --disable-debug was given. @@ -1535,14 +1536,14 @@ fi echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:1539: checking whether byte ordering is bigendian" >&5 +echo "configure:1540: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext <<EOF -#line 1546 "configure" +#line 1547 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -1553,11 +1554,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:1557: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1558: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext <<EOF -#line 1561 "configure" +#line 1562 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -1568,7 +1569,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:1572: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1573: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -1588,7 +1589,7 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 1592 "configure" +#line 1593 "configure" #include "confdefs.h" main () { /* Are we little or big endian? From Harbison&Steele. */ @@ -1601,7 +1602,7 @@ main () { exit (u.c[sizeof (long) - 1] == 1); } EOF -if { (eval echo configure:1605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -1630,7 +1631,7 @@ fi echo $ac_n "checking "for a 64 bit data type"""... $ac_c" 1>&6 -echo "configure:1634: checking "for a 64 bit data type"" >&5 +echo "configure:1635: checking "for a 64 bit data type"" >&5 if eval "test \"`echo '$''{'ecos_cv_type_64bit'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1648,7 +1649,7 @@ cross_compiling=$ac_cv_prog_cc_cross ctype_64bit="long long" else cat > conftest.$ac_ext <<EOF -#line 1652 "configure" +#line 1653 "configure" #include "confdefs.h" main() { @@ -1656,7 +1657,7 @@ else } EOF -if { (eval echo configure:1660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ctype_64bit=$type else @@ -1679,7 +1680,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cxxtype_64bit="long long" else cat > conftest.$ac_ext <<EOF -#line 1683 "configure" +#line 1684 "configure" #include "confdefs.h" int main(int argc, char ** argv) { @@ -1687,7 +1688,7 @@ else } EOF -if { (eval echo configure:1691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cxxtype_64bit=$type else @@ -1732,7 +1733,7 @@ EOF echo $ac_n "checking size of int *""... $ac_c" 1>&6 -echo "configure:1736: checking size of int *" >&5 +echo "configure:1737: checking size of int *" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int_p'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1740,7 +1741,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 1744 "configure" +#line 1745 "configure" #include "confdefs.h" #include <stdio.h> int main() @@ -1751,7 +1752,7 @@ int main() return(0); } EOF -if { (eval echo configure:1755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int_p=`cat conftestval` else @@ -1771,7 +1772,7 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:1775: checking size of long" >&5 +echo "configure:1776: checking size of long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1779,7 +1780,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 1783 "configure" +#line 1784 "configure" #include "confdefs.h" #include <stdio.h> int main() @@ -1790,7 +1791,7 @@ int main() return(0); } EOF -if { (eval echo configure:1794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long=`cat conftestval` else @@ -1815,7 +1816,7 @@ EOF echo $ac_n "checking "for __PRETTY_FUNCTION__ support"""... $ac_c" 1>&6 -echo "configure:1819: checking "for __PRETTY_FUNCTION__ support"" >&5 +echo "configure:1820: checking "for __PRETTY_FUNCTION__ support"" >&5 if eval "test \"`echo '$''{'ecos_cv_c_pretty_function'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1829,14 +1830,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <<EOF -#line 1833 "configure" +#line 1834 "configure" #include "confdefs.h" #include <stdio.h> int main() { puts(__PRETTY_FUNCTION__); ; return 0; } EOF -if { (eval echo configure:1840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* c_ok="yes" else @@ -1855,14 +1856,14 @@ ac_link='${CXX-g++} -o conftest${ac_exee cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 1859 "configure" +#line 1860 "configure" #include "confdefs.h" #include <cstdio> int main() { puts(__PRETTY_FUNCTION__); ; return 0; } EOF -if { (eval echo configure:1866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cxx_ok="yes" else @@ -1898,12 +1899,12 @@ EOF for ac_func in mkstemp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1902: checking for $ac_func" >&5 +echo "configure:1903: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1907 "configure" +#line 1908 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -1926,7 +1927,7 @@ choke me ; return 0; } EOF -if { (eval echo configure:1930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else
--- a/host/infra/testsuite/Makefile.in +++ b/host/infra/testsuite/Makefile.in @@ -105,6 +105,7 @@ ecos_infra_incdir = @ecos_infra_incdir@ ecos_infra_libdir = @ecos_infra_libdir@ ecos_libcdl_incdir = @ecos_libcdl_incdir@ ecos_libcdl_libdir = @ecos_libcdl_libdir@ +ecos_tk_includes = @ecos_tk_includes@ ecos_tk_libs = @ecos_tk_libs@ AUTOMAKE_OPTIONS = 1.3 foreign dejagnu
--- a/host/libcdl/ChangeLog +++ b/host/libcdl/ChangeLog @@ -1,3 +1,8 @@ +2003-02-12 Bart Veer <bartv@ecoscentric.com> + + * Makefile.in, configure, testsuite/Makefile.in: + Regenerate after acinclude.m4 update + 2003-02-11 Bart Veer <bartv@ecoscentric.com> * build.cxx (compare_and_copy):
--- a/host/libcdl/Makefile.in +++ b/host/libcdl/Makefile.in @@ -105,6 +105,7 @@ ecos_LIBS = @ecos_LIBS@ ecos_infra_libdir = @ecos_infra_libdir@ ecos_libcdl_incdir = @ecos_libcdl_incdir@ ecos_libcdl_libdir = @ecos_libcdl_libdir@ +ecos_tk_includes = @ecos_tk_includes@ ecos_tk_libs = @ecos_tk_libs@ AUTOMAKE_OPTIONS = 1.3 foreign
--- a/host/libcdl/configure +++ b/host/libcdl/configure @@ -39,13 +39,13 @@ ac_help="$ac_help ac_help="$ac_help --with-infra=<path> location of eCos infrastructure installation" ac_help="$ac_help + --with-tcl=<path> location of Tcl header and libraries" +ac_help="$ac_help --with-tcl-version=<vsn> version of Tcl to be used" ac_help="$ac_help --with-tcl-header=<path> location of Tcl header" ac_help="$ac_help --with-tcl-lib=<path> location of Tcl libraries" -ac_help="$ac_help - --with-tcl=<path> location of Tcl header and libraries" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -1471,6 +1471,7 @@ echo "configure:1470: checking "for Visu if test "${CC}" = "cl" ; then MSVC="yes" CXX="cl" + MSVC_SRCDIR=${srcdir} @@ -1479,7 +1480,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 @@ -1505,7 +1506,7 @@ fi echo $ac_n "checking "the default compiler flags"""... $ac_c" 1>&6 -echo "configure:1509: checking "the default compiler flags"" >&5 +echo "configure:1510: checking "the default compiler flags"" >&5 ecosflags_enable_debug="no" # Check whether --enable-debug or --disable-debug was given. @@ -1707,7 +1708,7 @@ EOF echo $ac_n "checking for eCos host-side infrastructure""... $ac_c" 1>&6 -echo "configure:1711: checking for eCos host-side infrastructure" >&5 +echo "configure:1712: checking for eCos host-side infrastructure" >&5 infra_builddir="" possibles=".. ../.. ../../.. ../../../.. ../../../../.." @@ -1770,7 +1771,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} @@ -1817,60 +1818,42 @@ fi - ecos_tcl_version="" - ecos_tcl_incdir="" - ecos_tcl_libdir="" ecos_tk_libs="" ecos_tk_libdir="" - - echo $ac_n "checking for Tcl version""... $ac_c" 1>&6 -echo "configure:1829: checking for Tcl version" >&5 - # Check whether --with-tcl-version or --without-tcl-version was given. -if test "${with_tcl_version+set}" = set; then - withval="$with_tcl_version" - - ecos_tcl_version=${with_tcl_version} - -else - - if test "${MSVC}" = "yes" ; then - ecos_tcl_version=80 - elif test "${ac_cv_cygwin}" = "yes" ; then - ecos_tcl_version=80 - else - ecos_tcl_version="" - fi - -fi - - echo "$ac_t""${ecos_tcl_version}" 1>&6 - echo $ac_n "checking for Tcl installation""... $ac_c" 1>&6 -echo "configure:1851: checking for Tcl installation" >&5 - - # Check whether --with-tcl-header or --without-tcl-header was given. -if test "${with_tcl_header+set}" = set; then - withval="$with_tcl_header" - : -fi - - # Check whether --with-tcl-lib or --without-tcl-lib was given. -if test "${with_tcl_lib+set}" = set; then - withval="$with_tcl_lib" - : -fi - +echo "configure:1826: checking for Tcl installation" >&5 # Check whether --with-tcl or --without-tcl was given. if test "${with_tcl+set}" = set; then withval="$with_tcl" : fi + # Check whether --with-tcl-version or --without-tcl-version was given. +if test "${with_tcl_version+set}" = set; then + withval="$with_tcl_version" + : +fi - - if test "${MSVC}" = "yes" ; then + + if test "${MSVC}" = "yes" ; then + # Check whether --with-tcl-header or --without-tcl-header was given. +if test "${with_tcl_header+set}" = set; then + withval="$with_tcl_header" + : +fi + # Check whether --with-tcl-lib or --without-tcl-lib was given. +if test "${with_tcl_lib+set}" = set; then + withval="$with_tcl_lib" + : +fi + + ecos_tcl_incdir="" + ecos_tcl_libdir="" + if test "${with_tcl_version+set}" != set ; then + { echo "configure: error: You must specify a Tcl version using --with-tcl-version=<vsn>" 1>&2; exit 1; } + fi if test "${with_tcl_header+set}" = set ; then ecos_tcl_incdir=${with_tcl_header} elif test "${with_tcl+set}" = set ; then @@ -1878,20 +1861,6 @@ fi else { echo "configure: error: You must specify a Tcl installation with either --with-tcl=<path> or --with-tcl-header=<path>" 1>&2; exit 1; } fi - - if test \! -r "${ecos_tcl_incdir}/tcl.h" ; then - { echo "configure: error: unable to locate Tcl header file tcl.h" 1>&2; exit 1; } - fi - ecos_msvc_tcl_incdir="${ecos_tcl_incdir}" - - - - if test "${MSVC}" = "yes" ; then - ecos_msvc_tcl_incdir=`cygpath -w ${ecos_msvc_tcl_incdir} | tr \\\\\\\\ /` - fi - - ecos_INCLUDES="${ecos_INCLUDES} \"-I${ecos_msvc_tcl_incdir}\"" - if test "${with_tcl_lib+set}" = set; then ecos_tcl_libdir=${with_tcl_lib} elif test "${with_tcl+set}" = set; then @@ -1899,6 +1868,18 @@ fi else { echo "configure: error: You must specify a Tcl installation with either --with-tcl=<path> or --with-tcl-lib=<path>" 1>&2; exit 1; } fi + + if test \! -r "${ecos_tcl_incdir}/tcl.h" ; then + { echo "configure: error: unable to locate Tcl header file tcl.h" 1>&2; exit 1; } + fi + + + + + if test "${MSVC}" = "yes" ; then + ecos_tcl_incdir=`cygpath -w ${ecos_tcl_incdir} | tr \\\\\\\\ /` + fi + @@ -1906,71 +1887,150 @@ fi ecos_tcl_libdir=`cygpath -w ${ecos_tcl_libdir} | tr \\\\\\\\ /` fi - ecos_LIBS="${ecos_LIBS} tcl${ecos_tcl_version}.lib" + ecos_INCLUDES="${ecos_INCLUDES} \"-I${ecos_tcl_incdir}\"" + ecos_LIBS="${ecos_LIBS} tcl${with_tcl_version}.lib" ecos_LDADD="${ecos_LDADD} \"-libpath=${ecos_tcl_libdir}\"" ecos_tk_libs="" else - possibles="${with_tcl_header} ${with_tcl}/include ${prefix}/include /usr/include/tcl${ecos_tcl_version} /usr/include" - - ecos_tcl_incdir="" + possibles="" + if test "${with_tcl+set}" = set ; then + possibles="${with_tcl}/lib" + if test "${with_tcl_version+set}" = set ; then + possibles="${possibles} ${with_tcl}/lib/tcl${with_tcl_version}" + fi + fi + possibles="${possibles} ${prefix}/lib" + if test "${with_tcl_version+set}" = set ; then + possibles="${possibles} ${prefix}/lib/tcl${with_tcl_version}" + fi + possibles="${possibles} /usr/lib" + if test "${with_tcl_version+set}" = set ; then + possibles="${possibles} /usr/lib/tcl${with_tcl_version}" + fi + + tclconfig="" for i in ${possibles}; do - if test -r "$i/"tcl.h""; then - ecos_tcl_incdir=$i + if test -r "$i/"tclConfig.sh""; then + tclconfig=$i break fi done - if test \! -r "${ecos_tcl_incdir}/tcl.h" ; then - { echo "configure: error: unable to locate Tcl header file tcl.h" 1>&2; exit 1; } - else - if test "${ecos_tcl_incdir}" != "/usr/include" ; then - ecos_INCLUDES="${ecos_INCLUDES} -I${ecos_tcl_incdir}" - fi + if test \! -r "${tclconfig}/tclConfig.sh" ; then + { echo "configure: error: unable to locate Tcl configuration file tclConfig.sh" 1>&2; exit 1; } + else + . ${tclconfig}/tclConfig.sh + + if test -z "${TCL_INC_DIR}" ; then + ecos_tcl_incdir="${TCL_PREFIX}/include" + else + ecos_tcl_incdir="${TCL_INC_DIR}" + fi + if test \! -r "${ecos_tcl_incdir}/tcl.h" ; then + { echo "configure: error: unable to locate Tcl header file tcl.h" 1>&2; exit 1; } + else + if test "${ecos_tcl_incdir}" != "/usr/include" ; then + ecos_INCLUDES="${ecos_INCLUDES} -I${ecos_tcl_incdir}" + fi + fi + + if test -z "${TCL_LIB_SPEC}" -a "${with_tcl_version+set}" = set ; then + + libtcl="" + for i in ${possibles}; do + if test -r "$i/"libtcl${with_tcl_version}.a""; then + libtcl=$i + break fi - possibles="${with_tcl_lib} ${with_tcl}/lib ${libdir} ${prefix}/lib /usr/lib/tcl${ecos_tcl_version} /usr/lib" - - ecos_tcl_libdir="" + done + + if test -r "${libtcl}/libtcl${with_tcl_version}.a" ; then + TCL_LIB_SPEC="-L${libtcl} -ltcl${with_tcl_version}" + fi + fi + if test -z "${TCL_LIB_SPEC}" ; then + + libtcl="" for i in ${possibles}; do - if test -r "$i/"tclConfig.sh""; then - ecos_tcl_libdir=$i + if test -r "$i/"libtcl.a""; then + libtcl=$i break fi done - if test \! -r "${ecos_tcl_libdir}/tclConfig.sh" ; then - { 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} -ltcl${ecos_tcl_version} ${TCL_LIBS}" - ecos_LDADD="${ecos_LDADD} -L${ecos_tcl_libdir}" - fi + if test -r "${libtcl}/libtcl.a" ; then + TCL_LIB_SPEC="-L${libtcl} -ltcl" + fi + fi + if test -z "${TCL_LIB_SPEC}" ; then + { echo "configure: error: ${tclconfig}/tclConfig.sh does not define TCL_LIB_SPEC" 1>&2; exit 1; } + fi + ecos_LIBS="${ecos_LIBS} ${TCL_LIB_SPEC}" - possible_tk_libdir=`echo ${ecos_tcl_libdir} | sed -e 's,tcl,tk,'` - possibles="${ecos_tcl_libdir} ${possible_tk_libdir}" - - ecos_tk_libdir="" + possibles=`echo ${possibles} | sed -e 's,tcl,tk,g'` + + tkconfig="" for i in ${possibles}; do if test -r "$i/"tkConfig.sh""; then - ecos_tk_libdir=$i + tkconfig=$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_tk_libdir}/tkConfig.sh - 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 + if test \! -r "${tkconfig}/tkConfig.sh" ; then + { echo "configure: error: unable to locate Tk config file tkConfig.sh" 1>&2; exit 1; } + else + . ${tkconfig}/tkConfig.sh + if test -z "${TK_INC_DIR}" ; then + if test "${TK_PREFIX}" = "/usr" ; then + ecos_tk_includes="${TK_XINCLUDES}" + else + ecos_tk_includes="-I${TK_PREFIX}/include ${TK_XINCLUDES}" + fi + else + ecos_tk_includes="-I${TK_INC_DIR} ${TK_XINCLUDES}" + fi + + if test -z "${TK_LIB_SPEC}" -a "${with_tcl_version+set}" = set ; then + + libtk="" + for i in ${possibles}; do + if test -r "$i/"libtk${with_tcl_version}.a""; then + libtk=$i + break fi + done + + if test -r "${libtk}/libtk${with_tcl_version}.a" ; then + TK_LIB_SPEC="-L${libtk} -ltk${with_tcl_version}" + fi + fi + if test -z "${TK_LIB_SPEC}" ; then + + libtk="" + for i in ${possibles}; do + if test -r "$i/"libtk.a""; then + libtk=$i + break + fi + done + + if test -r "${libtk}/libtk.a" ; then + TK_LIB_SPEC="-L${libtk} -ltk" + fi + fi + if test -z "${TK_LIB_SPEC}" ; then + { echo "configure: error: ${tkconfig}/tkConfig.sh does not define TK_LIB_SPEC" 1>&2; exit 1; } + fi + ecos_tk_libs="${TK_LIB_SPEC} ${TK_LIBS}" + fi + fi fi - echo "$ac_t""-I${ecos_tcl_incdir} -L${ecos_tcl_libdir}" 1>&6 - + echo "$ac_t""-I${ecos_tcl_incdir} ${TCL_LIB_SPEC}" 1>&6 + @@ -2144,6 +2204,7 @@ s%@MSVC_TRUE@%$MSVC_TRUE%g s%@MSVC_FALSE@%$MSVC_FALSE%g s%@ecos_infra_incdir@%$ecos_infra_incdir%g s%@ecos_infra_libdir@%$ecos_infra_libdir%g +s%@ecos_tk_includes@%$ecos_tk_includes%g s%@ecos_tk_libs@%$ecos_tk_libs%g CEOF
--- a/host/libcdl/testsuite/Makefile.in +++ b/host/libcdl/testsuite/Makefile.in @@ -105,6 +105,7 @@ ecos_infra_incdir = @ecos_infra_incdir@ ecos_infra_libdir = @ecos_infra_libdir@ ecos_libcdl_incdir = @ecos_libcdl_incdir@ ecos_libcdl_libdir = @ecos_libcdl_libdir@ +ecos_tk_includes = @ecos_tk_includes@ ecos_tk_libs = @ecos_tk_libs@ AUTOMAKE_OPTIONS = 1.3 foreign dejagnu
--- a/host/tools/Utils/ChangeLog +++ b/host/tools/Utils/ChangeLog @@ -1,3 +1,8 @@ +2003-02-12 Bart Veer <bartv@ecoscentric.com> + + * common/configure, common/Makefile.in: + Regenerate after acinclude.m4 update + 2003-01-25 John Dallaway <jld@ecoscentric.com> * common/Collections.cpp: #include <winsock2.h> early for Cygwin
--- a/host/tools/Utils/common/Makefile.in +++ b/host/tools/Utils/common/Makefile.in @@ -107,6 +107,7 @@ ecos_infra_incdir = @ecos_infra_incdir@ ecos_infra_libdir = @ecos_infra_libdir@ ecos_libcdl_incdir = @ecos_libcdl_incdir@ ecos_libcdl_libdir = @ecos_libcdl_libdir@ +ecos_tk_includes = @ecos_tk_includes@ ecos_tk_libs = @ecos_tk_libs@ AUTOMAKE_OPTIONS = 1.3 cygnus
--- a/host/tools/Utils/common/configure +++ b/host/tools/Utils/common/configure @@ -1449,6 +1449,7 @@ echo "configure:1448: checking "for Visu if test "${CC}" = "cl" ; then MSVC="yes" CXX="cl" + MSVC_SRCDIR=${srcdir} @@ -1457,7 +1458,7 @@ echo "configure:1448: 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 @@ -1483,7 +1484,7 @@ fi echo $ac_n "checking "the default compiler flags"""... $ac_c" 1>&6 -echo "configure:1487: checking "the default compiler flags"" >&5 +echo "configure:1488: checking "the default compiler flags"" >&5 ecosflags_enable_debug="no" # Check whether --enable-debug or --disable-debug was given.
--- a/host/tools/configtool/standalone/common/ChangeLog +++ b/host/tools/configtool/standalone/common/ChangeLog @@ -1,3 +1,8 @@ +2003-02-12 Bart Veer <bartv@ecoscentric.com> + + * Makefile.in, configure: + Regenerate after acinclude.m4 update + 2003-02-11 Bart Veer <bartv@ecoscentric.com> * ecosconfig.cxx:
--- a/host/tools/configtool/standalone/common/Makefile.in +++ b/host/tools/configtool/standalone/common/Makefile.in @@ -105,6 +105,7 @@ ecos_infra_incdir = @ecos_infra_incdir@ ecos_infra_libdir = @ecos_infra_libdir@ ecos_libcdl_incdir = @ecos_libcdl_incdir@ ecos_libcdl_libdir = @ecos_libcdl_libdir@ +ecos_tk_includes = @ecos_tk_includes@ ecos_tk_libs = @ecos_tk_libs@ AUTOMAKE_OPTIONS = 1.3 cygnus
--- a/host/tools/configtool/standalone/common/configure +++ b/host/tools/configtool/standalone/common/configure @@ -45,13 +45,13 @@ ac_help="$ac_help ac_help="$ac_help --with-infra=<path> location of eCos infrastructure installation" ac_help="$ac_help + --with-tcl=<path> location of Tcl header and libraries" +ac_help="$ac_help --with-tcl-version=<vsn> version of Tcl to be used" ac_help="$ac_help --with-tcl-header=<path> location of Tcl header" ac_help="$ac_help --with-tcl-lib=<path> location of Tcl libraries" -ac_help="$ac_help - --with-tcl=<path> location of Tcl header and libraries" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -1439,6 +1439,7 @@ echo "configure:1438: checking "for Visu if test "${CC}" = "cl" ; then MSVC="yes" CXX="cl" + MSVC_SRCDIR=${srcdir} @@ -1447,7 +1448,7 @@ echo "configure:1438: 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 @@ -1473,7 +1474,7 @@ fi echo $ac_n "checking "the default compiler flags"""... $ac_c" 1>&6 -echo "configure:1477: checking "the default compiler flags"" >&5 +echo "configure:1478: checking "the default compiler flags"" >&5 ecosflags_enable_debug="no" # Check whether --enable-debug or --disable-debug was given. @@ -1676,7 +1677,7 @@ EOF echo $ac_n "checking for libcdl""... $ac_c" 1>&6 -echo "configure:1680: checking for libcdl" >&5 +echo "configure:1681: checking for libcdl" >&5 libcdl_srcdir="" possibles="${srcdir}/.. ${srcdir}/../.. ${srcdir}/../../.. ${srcdir}/../../../.. ${srcdir}/../../../../.." @@ -1768,7 +1769,7 @@ fi { echo "configure: error: libcdl headers not found" 1>&2; exit 1; } fi if test "${MSVC}" = "yes" ; then - ecos_msvc_libcdl_incdir = "${ecos_libcdl_incdir}" + ecos_msvc_libcdl_incdir="${ecos_libcdl_incdir}" @@ -1812,7 +1813,7 @@ fi echo $ac_n "checking for eCos host-side infrastructure""... $ac_c" 1>&6 -echo "configure:1816: checking for eCos host-side infrastructure" >&5 +echo "configure:1817: checking for eCos host-side infrastructure" >&5 infra_builddir="" possibles=".. ../.. ../../.. ../../../.. ../../../../.." @@ -1875,7 +1876,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} @@ -1922,60 +1923,42 @@ fi - ecos_tcl_version="" - ecos_tcl_incdir="" - ecos_tcl_libdir="" ecos_tk_libs="" ecos_tk_libdir="" - - echo $ac_n "checking for Tcl version""... $ac_c" 1>&6 -echo "configure:1934: checking for Tcl version" >&5 - # Check whether --with-tcl-version or --without-tcl-version was given. -if test "${with_tcl_version+set}" = set; then - withval="$with_tcl_version" - - ecos_tcl_version=${with_tcl_version} - -else - - if test "${MSVC}" = "yes" ; then - ecos_tcl_version=80 - elif test "${ac_cv_cygwin}" = "yes" ; then - ecos_tcl_version=80 - else - ecos_tcl_version="" - fi - -fi - - echo "$ac_t""${ecos_tcl_version}" 1>&6 - echo $ac_n "checking for Tcl installation""... $ac_c" 1>&6 -echo "configure:1956: checking for Tcl installation" >&5 - - # Check whether --with-tcl-header or --without-tcl-header was given. -if test "${with_tcl_header+set}" = set; then - withval="$with_tcl_header" - : -fi - - # Check whether --with-tcl-lib or --without-tcl-lib was given. -if test "${with_tcl_lib+set}" = set; then - withval="$with_tcl_lib" - : -fi - +echo "configure:1931: checking for Tcl installation" >&5 # Check whether --with-tcl or --without-tcl was given. if test "${with_tcl+set}" = set; then withval="$with_tcl" : fi + # Check whether --with-tcl-version or --without-tcl-version was given. +if test "${with_tcl_version+set}" = set; then + withval="$with_tcl_version" + : +fi - - if test "${MSVC}" = "yes" ; then + + if test "${MSVC}" = "yes" ; then + # Check whether --with-tcl-header or --without-tcl-header was given. +if test "${with_tcl_header+set}" = set; then + withval="$with_tcl_header" + : +fi + # Check whether --with-tcl-lib or --without-tcl-lib was given. +if test "${with_tcl_lib+set}" = set; then + withval="$with_tcl_lib" + : +fi + + ecos_tcl_incdir="" + ecos_tcl_libdir="" + if test "${with_tcl_version+set}" != set ; then + { echo "configure: error: You must specify a Tcl version using --with-tcl-version=<vsn>" 1>&2; exit 1; } + fi if test "${with_tcl_header+set}" = set ; then ecos_tcl_incdir=${with_tcl_header} elif test "${with_tcl+set}" = set ; then @@ -1983,20 +1966,6 @@ fi else { echo "configure: error: You must specify a Tcl installation with either --with-tcl=<path> or --with-tcl-header=<path>" 1>&2; exit 1; } fi - - if test \! -r "${ecos_tcl_incdir}/tcl.h" ; then - { echo "configure: error: unable to locate Tcl header file tcl.h" 1>&2; exit 1; } - fi - ecos_msvc_tcl_incdir="${ecos_tcl_incdir}" - - - - if test "${MSVC}" = "yes" ; then - ecos_msvc_tcl_incdir=`cygpath -w ${ecos_msvc_tcl_incdir} | tr \\\\\\\\ /` - fi - - ecos_INCLUDES="${ecos_INCLUDES} \"-I${ecos_msvc_tcl_incdir}\"" - if test "${with_tcl_lib+set}" = set; then ecos_tcl_libdir=${with_tcl_lib} elif test "${with_tcl+set}" = set; then @@ -2004,6 +1973,18 @@ fi else { echo "configure: error: You must specify a Tcl installation with either --with-tcl=<path> or --with-tcl-lib=<path>" 1>&2; exit 1; } fi + + if test \! -r "${ecos_tcl_incdir}/tcl.h" ; then + { echo "configure: error: unable to locate Tcl header file tcl.h" 1>&2; exit 1; } + fi + + + + + if test "${MSVC}" = "yes" ; then + ecos_tcl_incdir=`cygpath -w ${ecos_tcl_incdir} | tr \\\\\\\\ /` + fi + @@ -2011,71 +1992,150 @@ fi ecos_tcl_libdir=`cygpath -w ${ecos_tcl_libdir} | tr \\\\\\\\ /` fi - ecos_LIBS="${ecos_LIBS} tcl${ecos_tcl_version}.lib" + ecos_INCLUDES="${ecos_INCLUDES} \"-I${ecos_tcl_incdir}\"" + ecos_LIBS="${ecos_LIBS} tcl${with_tcl_version}.lib" ecos_LDADD="${ecos_LDADD} \"-libpath=${ecos_tcl_libdir}\"" ecos_tk_libs="" else - possibles="${with_tcl_header} ${with_tcl}/include ${prefix}/include /usr/include/tcl${ecos_tcl_version} /usr/include" - - ecos_tcl_incdir="" + possibles="" + if test "${with_tcl+set}" = set ; then + possibles="${with_tcl}/lib" + if test "${with_tcl_version+set}" = set ; then + possibles="${possibles} ${with_tcl}/lib/tcl${with_tcl_version}" + fi + fi + possibles="${possibles} ${prefix}/lib" + if test "${with_tcl_version+set}" = set ; then + possibles="${possibles} ${prefix}/lib/tcl${with_tcl_version}" + fi + possibles="${possibles} /usr/lib" + if test "${with_tcl_version+set}" = set ; then + possibles="${possibles} /usr/lib/tcl${with_tcl_version}" + fi + + tclconfig="" for i in ${possibles}; do - if test -r "$i/"tcl.h""; then - ecos_tcl_incdir=$i + if test -r "$i/"tclConfig.sh""; then + tclconfig=$i break fi done - if test \! -r "${ecos_tcl_incdir}/tcl.h" ; then - { echo "configure: error: unable to locate Tcl header file tcl.h" 1>&2; exit 1; } - else - if test "${ecos_tcl_incdir}" != "/usr/include" ; then - ecos_INCLUDES="${ecos_INCLUDES} -I${ecos_tcl_incdir}" - fi + if test \! -r "${tclconfig}/tclConfig.sh" ; then + { echo "configure: error: unable to locate Tcl configuration file tclConfig.sh" 1>&2; exit 1; } + else + . ${tclconfig}/tclConfig.sh + + if test -z "${TCL_INC_DIR}" ; then + ecos_tcl_incdir="${TCL_PREFIX}/include" + else + ecos_tcl_incdir="${TCL_INC_DIR}" + fi + if test \! -r "${ecos_tcl_incdir}/tcl.h" ; then + { echo "configure: error: unable to locate Tcl header file tcl.h" 1>&2; exit 1; } + else + if test "${ecos_tcl_incdir}" != "/usr/include" ; then + ecos_INCLUDES="${ecos_INCLUDES} -I${ecos_tcl_incdir}" + fi + fi + + if test -z "${TCL_LIB_SPEC}" -a "${with_tcl_version+set}" = set ; then + + libtcl="" + for i in ${possibles}; do + if test -r "$i/"libtcl${with_tcl_version}.a""; then + libtcl=$i + break fi - possibles="${with_tcl_lib} ${with_tcl}/lib ${libdir} ${prefix}/lib /usr/lib/tcl${ecos_tcl_version} /usr/lib" - - ecos_tcl_libdir="" + done + + if test -r "${libtcl}/libtcl${with_tcl_version}.a" ; then + TCL_LIB_SPEC="-L${libtcl} -ltcl${with_tcl_version}" + fi + fi + if test -z "${TCL_LIB_SPEC}" ; then + + libtcl="" for i in ${possibles}; do - if test -r "$i/"tclConfig.sh""; then - ecos_tcl_libdir=$i + if test -r "$i/"libtcl.a""; then + libtcl=$i break fi done - if test \! -r "${ecos_tcl_libdir}/tclConfig.sh" ; then - { 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} -ltcl${ecos_tcl_version} ${TCL_LIBS}" - ecos_LDADD="${ecos_LDADD} -L${ecos_tcl_libdir}" - fi + if test -r "${libtcl}/libtcl.a" ; then + TCL_LIB_SPEC="-L${libtcl} -ltcl" + fi + fi + if test -z "${TCL_LIB_SPEC}" ; then + { echo "configure: error: ${tclconfig}/tclConfig.sh does not define TCL_LIB_SPEC" 1>&2; exit 1; } + fi + ecos_LIBS="${ecos_LIBS} ${TCL_LIB_SPEC}" - possible_tk_libdir=`echo ${ecos_tcl_libdir} | sed -e 's,tcl,tk,'` - possibles="${ecos_tcl_libdir} ${possible_tk_libdir}" - - ecos_tk_libdir="" + possibles=`echo ${possibles} | sed -e 's,tcl,tk,g'` + + tkconfig="" for i in ${possibles}; do if test -r "$i/"tkConfig.sh""; then - ecos_tk_libdir=$i + tkconfig=$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_tk_libdir}/tkConfig.sh - 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 + if test \! -r "${tkconfig}/tkConfig.sh" ; then + { echo "configure: error: unable to locate Tk config file tkConfig.sh" 1>&2; exit 1; } + else + . ${tkconfig}/tkConfig.sh + if test -z "${TK_INC_DIR}" ; then + if test "${TK_PREFIX}" = "/usr" ; then + ecos_tk_includes="${TK_XINCLUDES}" + else + ecos_tk_includes="-I${TK_PREFIX}/include ${TK_XINCLUDES}" + fi + else + ecos_tk_includes="-I${TK_INC_DIR} ${TK_XINCLUDES}" + fi + + if test -z "${TK_LIB_SPEC}" -a "${with_tcl_version+set}" = set ; then + + libtk="" + for i in ${possibles}; do + if test -r "$i/"libtk${with_tcl_version}.a""; then + libtk=$i + break fi + done + + if test -r "${libtk}/libtk${with_tcl_version}.a" ; then + TK_LIB_SPEC="-L${libtk} -ltk${with_tcl_version}" + fi + fi + if test -z "${TK_LIB_SPEC}" ; then + + libtk="" + for i in ${possibles}; do + if test -r "$i/"libtk.a""; then + libtk=$i + break + fi + done + + if test -r "${libtk}/libtk.a" ; then + TK_LIB_SPEC="-L${libtk} -ltk" + fi + fi + if test -z "${TK_LIB_SPEC}" ; then + { echo "configure: error: ${tkconfig}/tkConfig.sh does not define TK_LIB_SPEC" 1>&2; exit 1; } + fi + ecos_tk_libs="${TK_LIB_SPEC} ${TK_LIBS}" + fi + fi fi - echo "$ac_t""-I${ecos_tcl_incdir} -L${ecos_tcl_libdir}" 1>&6 - + echo "$ac_t""-I${ecos_tcl_incdir} ${TCL_LIB_SPEC}" 1>&6 + @@ -2259,6 +2319,7 @@ s%@ecos_libcdl_incdir@%$ecos_libcdl_incd s%@ecos_libcdl_libdir@%$ecos_libcdl_libdir%g s%@ecos_infra_incdir@%$ecos_infra_incdir%g s%@ecos_infra_libdir@%$ecos_infra_libdir%g +s%@ecos_tk_includes@%$ecos_tk_includes%g s%@ecos_tk_libs@%$ecos_tk_libs%g CEOF
--- a/packages/devs/eth/synth/ecosynth/current/ChangeLog +++ b/packages/devs/eth/synth/ecosynth/current/ChangeLog @@ -1,3 +1,8 @@ +2003-02-12 Bart Veer <bartv@ecoscentric.com> + + * host/Makefile.in, host/configure: + Regenerate after toplevel acinclude.m4 update + 2003-02-12 Jonathan Larmour <jifl@eCosCentric.com> * cdl/syntheth.cdl (CYGPKG_DEVS_ETH_ECOSYNTH_CFLAGS_ADD): @@ -23,7 +28,7 @@ 2002-08-07 Bart Veer <bartv@ecoscentri //####ECOSGPLCOPYRIGHTBEGIN#### // ------------------------------------------- // This file is part of eCos, the Embedded Configurable Operating System. -// Copyright (C) 2002 Bart Veer +// Copyright (C) 2002, 2003 Bart Veer // // eCos is free software; you can redistribute it and/or modify it under // the terms of the GNU General Public License as published by the Free
--- a/packages/devs/eth/synth/ecosynth/current/host/Makefile.in +++ b/packages/devs/eth/synth/ecosynth/current/host/Makefile.in @@ -107,6 +107,7 @@ ecos_infra_incdir = @ecos_infra_incdir@ ecos_infra_libdir = @ecos_infra_libdir@ ecos_libcdl_incdir = @ecos_libcdl_incdir@ ecos_libcdl_libdir = @ecos_libcdl_libdir@ +ecos_tk_includes = @ecos_tk_includes@ ecos_tk_libs = @ecos_tk_libs@ AUTOMAKE_OPTIONS = 1.3 foreign
--- a/packages/devs/eth/synth/ecosynth/current/host/configure +++ b/packages/devs/eth/synth/ecosynth/current/host/configure @@ -1407,6 +1407,7 @@ echo "configure:1406: checking "for Visu if test "${CC}" = "cl" ; then MSVC="yes" CXX="cl" + MSVC_SRCDIR=${srcdir} @@ -1415,7 +1416,7 @@ echo "configure:1406: 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 @@ -1441,7 +1442,7 @@ fi echo $ac_n "checking "the default compiler flags"""... $ac_c" 1>&6 -echo "configure:1445: checking "the default compiler flags"" >&5 +echo "configure:1446: checking "the default compiler flags"" >&5 ecosflags_enable_debug="no" # Check whether --enable-debug or --disable-debug was given. @@ -1536,7 +1537,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1540: checking how to run the C preprocessor" >&5 +echo "configure:1541: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1551,13 +1552,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 1555 "configure" +#line 1556 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1561: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1562: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1568,13 +1569,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 1572 "configure" +#line 1573 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1578: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1579: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1585,13 +1586,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 1589 "configure" +#line 1590 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1595: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1596: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1619,17 +1620,17 @@ for ac_hdr in "linux/if_tun.h" do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1623: checking for $ac_hdr" >&5 +echo "configure:1624: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1628 "configure" +#line 1629 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1633: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1634: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest*
--- a/packages/devs/watchdog/synth/current/ChangeLog +++ b/packages/devs/watchdog/synth/current/ChangeLog @@ -1,3 +1,8 @@ +2003-02-12 Bart Veer <bartv@ecoscentric.com> + + * host/Makefile.in: + Regenerate after toplevel acinclude.m4 update + 2002-09-16 Bart Veer <bartv@ecoscentric.com> * cdl/synth_watchdog.cdl: @@ -12,7 +17,7 @@ 2002-09-04 Bart Veer <bartv@ecoscentri //####ECOSGPLCOPYRIGHTBEGIN#### // ------------------------------------------- // This file is part of eCos, the Embedded Configurable Operating System. -// Copyright (C) 2002 Bart Veer +// Copyright (C) 2002, 2003 Bart Veer // // eCos is free software; you can redistribute it and/or modify it under // the terms of the GNU General Public License as published by the Free
--- a/packages/devs/watchdog/synth/current/host/Makefile.in +++ b/packages/devs/watchdog/synth/current/host/Makefile.in @@ -105,6 +105,7 @@ ecos_infra_incdir = @ecos_infra_incdir@ ecos_infra_libdir = @ecos_infra_libdir@ ecos_libcdl_incdir = @ecos_libcdl_incdir@ ecos_libcdl_libdir = @ecos_libcdl_libdir@ +ecos_tk_includes = @ecos_tk_includes@ ecos_tk_libs = @ecos_tk_libs@ AUTOMAKE_OPTIONS = 1.3 foreign
--- a/packages/hal/synth/arch/current/ChangeLog +++ b/packages/hal/synth/arch/current/ChangeLog @@ -1,3 +1,8 @@ +2003-02-12 Bart Veer <bartv@ecoscentric.com> + + * host/Makefile.am, host/Makefile.in, configure: + Regenerate after acinclude.m4 update + 2002-12-03 Bart Veer <bartv@ecoscentric.com> * src/synth_entry.c:
--- a/packages/hal/synth/arch/current/host/Makefile.am +++ b/packages/hal/synth/arch/current/host/Makefile.am @@ -11,7 +11,7 @@ ######COPYRIGHTBEGIN#### # # ---------------------------------------------------------------------------- -# Copyright (C) 2002 Bart Veer +# Copyright (C) 2002, 2003 Bart Veer # # This file is part of the eCos synthetic target support. # @@ -60,7 +60,7 @@ AM_CFLAGS = @ecos_CFLAGS@ -DECOSYN -DPACKAGE_VERSION=\"@PACKAGE_VERSION@\" \ -DPACKAGE_INSTALL=\"@PACKAGE_INSTALL@\" AM_CXXFLAGS = @ecos_CXXFLAGS@ -INCLUDES = @ecos_INCLUDES@ +INCLUDES = @ecos_INCLUDES@ @ecos_tk_includes@ LIBS = @ecos_LIBS@ @ecos_LDADD@ ## The synthetic target support consists of a single program ecosynth,
--- a/packages/hal/synth/arch/current/host/Makefile.in +++ b/packages/hal/synth/arch/current/host/Makefile.in @@ -13,7 +13,7 @@ ######COPYRIGHTBEGIN#### # # ---------------------------------------------------------------------------- -# Copyright (C) 2002 Bart Veer +# Copyright (C) 2002, 2003 Bart Veer # # This file is part of the eCos synthetic target support. # @@ -108,6 +108,7 @@ ecos_infra_incdir = @ecos_infra_incdir@ ecos_infra_libdir = @ecos_infra_libdir@ ecos_libcdl_incdir = @ecos_libcdl_incdir@ ecos_libcdl_libdir = @ecos_libcdl_libdir@ +ecos_tk_includes = @ecos_tk_includes@ ecos_tk_libs = @ecos_tk_libs@ AUTOMAKE_OPTIONS = 1.3 foreign @@ -119,7 +120,7 @@ AUTOMAKE_OPTIONS = 1.3 foreign @SUPPORTED_TRUE@ -DPACKAGE_VERSION=\"@PACKAGE_VERSION@\" \ @SUPPORTED_TRUE@ -DPACKAGE_INSTALL=\"@PACKAGE_INSTALL@\" @SUPPORTED_TRUE@AM_CXXFLAGS = @SUPPORTED_TRUE@@ecos_CXXFLAGS@ -@SUPPORTED_TRUE@INCLUDES = @SUPPORTED_TRUE@@ecos_INCLUDES@ +@SUPPORTED_TRUE@INCLUDES = @SUPPORTED_TRUE@@ecos_INCLUDES@ @ecos_tk_includes@ @SUPPORTED_TRUE@LIBS = @SUPPORTED_TRUE@@ecos_LIBS@ @ecos_LDADD@ @SUPPORTED_TRUE@synthdir = @SUPPORTED_TRUE@$(libexecdir)/ecos/@PACKAGE_INSTALL@
--- a/packages/hal/synth/arch/current/host/configure +++ b/packages/hal/synth/arch/current/host/configure @@ -19,13 +19,13 @@ ac_help="$ac_help ac_help="$ac_help --enable-ansi do an ANSI rather than a unicode build" ac_help="$ac_help + --with-tcl=<path> location of Tcl header and libraries" +ac_help="$ac_help --with-tcl-version=<vsn> version of Tcl to be used" ac_help="$ac_help --with-tcl-header=<path> location of Tcl header" ac_help="$ac_help --with-tcl-lib=<path> location of Tcl libraries" -ac_help="$ac_help - --with-tcl=<path> location of Tcl header and libraries" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -1412,6 +1412,7 @@ echo "configure:1411: checking "for Visu if test "${CC}" = "cl" ; then MSVC="yes" CXX="cl" + MSVC_SRCDIR=${srcdir} @@ -1420,7 +1421,7 @@ echo "configure:1411: 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 @@ -1446,7 +1447,7 @@ fi echo $ac_n "checking "the default compiler flags"""... $ac_c" 1>&6 -echo "configure:1450: checking "the default compiler flags"" >&5 +echo "configure:1451: checking "the default compiler flags"" >&5 ecosflags_enable_debug="no" # Check whether --enable-debug or --disable-debug was given. @@ -1511,60 +1512,42 @@ fi - ecos_tcl_version="" - ecos_tcl_incdir="" - ecos_tcl_libdir="" ecos_tk_libs="" ecos_tk_libdir="" - - echo $ac_n "checking for Tcl version""... $ac_c" 1>&6 -echo "configure:1523: checking for Tcl version" >&5 - # Check whether --with-tcl-version or --without-tcl-version was given. -if test "${with_tcl_version+set}" = set; then - withval="$with_tcl_version" - - ecos_tcl_version=${with_tcl_version} - -else - - if test "${MSVC}" = "yes" ; then - ecos_tcl_version=80 - elif test "${ac_cv_cygwin}" = "yes" ; then - ecos_tcl_version=80 - else - ecos_tcl_version="" - fi - -fi - - echo "$ac_t""${ecos_tcl_version}" 1>&6 - echo $ac_n "checking for Tcl installation""... $ac_c" 1>&6 -echo "configure:1545: checking for Tcl installation" >&5 - - # Check whether --with-tcl-header or --without-tcl-header was given. -if test "${with_tcl_header+set}" = set; then - withval="$with_tcl_header" - : -fi - - # Check whether --with-tcl-lib or --without-tcl-lib was given. -if test "${with_tcl_lib+set}" = set; then - withval="$with_tcl_lib" - : -fi - +echo "configure:1520: checking for Tcl installation" >&5 # Check whether --with-tcl or --without-tcl was given. if test "${with_tcl+set}" = set; then withval="$with_tcl" : fi + # Check whether --with-tcl-version or --without-tcl-version was given. +if test "${with_tcl_version+set}" = set; then + withval="$with_tcl_version" + : +fi - - if test "${MSVC}" = "yes" ; then + + if test "${MSVC}" = "yes" ; then + # Check whether --with-tcl-header or --without-tcl-header was given. +if test "${with_tcl_header+set}" = set; then + withval="$with_tcl_header" + : +fi + # Check whether --with-tcl-lib or --without-tcl-lib was given. +if test "${with_tcl_lib+set}" = set; then + withval="$with_tcl_lib" + : +fi + + ecos_tcl_incdir="" + ecos_tcl_libdir="" + if test "${with_tcl_version+set}" != set ; then + { echo "configure: error: You must specify a Tcl version using --with-tcl-version=<vsn>" 1>&2; exit 1; } + fi if test "${with_tcl_header+set}" = set ; then ecos_tcl_incdir=${with_tcl_header} elif test "${with_tcl+set}" = set ; then @@ -1572,20 +1555,6 @@ fi else { echo "configure: error: You must specify a Tcl installation with either --with-tcl=<path> or --with-tcl-header=<path>" 1>&2; exit 1; } fi - - if test \! -r "${ecos_tcl_incdir}/tcl.h" ; then - { echo "configure: error: unable to locate Tcl header file tcl.h" 1>&2; exit 1; } - fi - ecos_msvc_tcl_incdir="${ecos_tcl_incdir}" - - - - if test "${MSVC}" = "yes" ; then - ecos_msvc_tcl_incdir=`cygpath -w ${ecos_msvc_tcl_incdir} | tr \\\\\\\\ /` - fi - - ecos_INCLUDES="${ecos_INCLUDES} \"-I${ecos_msvc_tcl_incdir}\"" - if test "${with_tcl_lib+set}" = set; then ecos_tcl_libdir=${with_tcl_lib} elif test "${with_tcl+set}" = set; then @@ -1593,6 +1562,18 @@ fi else { echo "configure: error: You must specify a Tcl installation with either --with-tcl=<path> or --with-tcl-lib=<path>" 1>&2; exit 1; } fi + + if test \! -r "${ecos_tcl_incdir}/tcl.h" ; then + { echo "configure: error: unable to locate Tcl header file tcl.h" 1>&2; exit 1; } + fi + + + + + if test "${MSVC}" = "yes" ; then + ecos_tcl_incdir=`cygpath -w ${ecos_tcl_incdir} | tr \\\\\\\\ /` + fi + @@ -1600,71 +1581,150 @@ fi ecos_tcl_libdir=`cygpath -w ${ecos_tcl_libdir} | tr \\\\\\\\ /` fi - ecos_LIBS="${ecos_LIBS} tcl${ecos_tcl_version}.lib" + ecos_INCLUDES="${ecos_INCLUDES} \"-I${ecos_tcl_incdir}\"" + ecos_LIBS="${ecos_LIBS} tcl${with_tcl_version}.lib" ecos_LDADD="${ecos_LDADD} \"-libpath=${ecos_tcl_libdir}\"" ecos_tk_libs="" else - possibles="${with_tcl_header} ${with_tcl}/include ${prefix}/include /usr/include/tcl${ecos_tcl_version} /usr/include" - - ecos_tcl_incdir="" + possibles="" + if test "${with_tcl+set}" = set ; then + possibles="${with_tcl}/lib" + if test "${with_tcl_version+set}" = set ; then + possibles="${possibles} ${with_tcl}/lib/tcl${with_tcl_version}" + fi + fi + possibles="${possibles} ${prefix}/lib" + if test "${with_tcl_version+set}" = set ; then + possibles="${possibles} ${prefix}/lib/tcl${with_tcl_version}" + fi + possibles="${possibles} /usr/lib" + if test "${with_tcl_version+set}" = set ; then + possibles="${possibles} /usr/lib/tcl${with_tcl_version}" + fi + + tclconfig="" for i in ${possibles}; do - if test -r "$i/"tcl.h""; then - ecos_tcl_incdir=$i + if test -r "$i/"tclConfig.sh""; then + tclconfig=$i break fi done - if test \! -r "${ecos_tcl_incdir}/tcl.h" ; then - { echo "configure: error: unable to locate Tcl header file tcl.h" 1>&2; exit 1; } - else - if test "${ecos_tcl_incdir}" != "/usr/include" ; then - ecos_INCLUDES="${ecos_INCLUDES} -I${ecos_tcl_incdir}" - fi + if test \! -r "${tclconfig}/tclConfig.sh" ; then + { echo "configure: error: unable to locate Tcl configuration file tclConfig.sh" 1>&2; exit 1; } + else + . ${tclconfig}/tclConfig.sh + + if test -z "${TCL_INC_DIR}" ; then + ecos_tcl_incdir="${TCL_PREFIX}/include" + else + ecos_tcl_incdir="${TCL_INC_DIR}" + fi + if test \! -r "${ecos_tcl_incdir}/tcl.h" ; then + { echo "configure: error: unable to locate Tcl header file tcl.h" 1>&2; exit 1; } + else + if test "${ecos_tcl_incdir}" != "/usr/include" ; then + ecos_INCLUDES="${ecos_INCLUDES} -I${ecos_tcl_incdir}" + fi + fi + + if test -z "${TCL_LIB_SPEC}" -a "${with_tcl_version+set}" = set ; then + + libtcl="" + for i in ${possibles}; do + if test -r "$i/"libtcl${with_tcl_version}.a""; then + libtcl=$i + break fi - possibles="${with_tcl_lib} ${with_tcl}/lib ${libdir} ${prefix}/lib /usr/lib/tcl${ecos_tcl_version} /usr/lib" - - ecos_tcl_libdir="" + done + + if test -r "${libtcl}/libtcl${with_tcl_version}.a" ; then + TCL_LIB_SPEC="-L${libtcl} -ltcl${with_tcl_version}" + fi + fi + if test -z "${TCL_LIB_SPEC}" ; then + + libtcl="" for i in ${possibles}; do - if test -r "$i/"tclConfig.sh""; then - ecos_tcl_libdir=$i + if test -r "$i/"libtcl.a""; then + libtcl=$i break fi done - if test \! -r "${ecos_tcl_libdir}/tclConfig.sh" ; then - { 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} -ltcl${ecos_tcl_version} ${TCL_LIBS}" - ecos_LDADD="${ecos_LDADD} -L${ecos_tcl_libdir}" - fi + if test -r "${libtcl}/libtcl.a" ; then + TCL_LIB_SPEC="-L${libtcl} -ltcl" + fi + fi + if test -z "${TCL_LIB_SPEC}" ; then + { echo "configure: error: ${tclconfig}/tclConfig.sh does not define TCL_LIB_SPEC" 1>&2; exit 1; } + fi + ecos_LIBS="${ecos_LIBS} ${TCL_LIB_SPEC}" - possible_tk_libdir=`echo ${ecos_tcl_libdir} | sed -e 's,tcl,tk,'` - possibles="${ecos_tcl_libdir} ${possible_tk_libdir}" - - ecos_tk_libdir="" + possibles=`echo ${possibles} | sed -e 's,tcl,tk,g'` + + tkconfig="" for i in ${possibles}; do if test -r "$i/"tkConfig.sh""; then - ecos_tk_libdir=$i + tkconfig=$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_tk_libdir}/tkConfig.sh - 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 + if test \! -r "${tkconfig}/tkConfig.sh" ; then + { echo "configure: error: unable to locate Tk config file tkConfig.sh" 1>&2; exit 1; } + else + . ${tkconfig}/tkConfig.sh + if test -z "${TK_INC_DIR}" ; then + if test "${TK_PREFIX}" = "/usr" ; then + ecos_tk_includes="${TK_XINCLUDES}" + else + ecos_tk_includes="-I${TK_PREFIX}/include ${TK_XINCLUDES}" + fi + else + ecos_tk_includes="-I${TK_INC_DIR} ${TK_XINCLUDES}" + fi + + if test -z "${TK_LIB_SPEC}" -a "${with_tcl_version+set}" = set ; then + + libtk="" + for i in ${possibles}; do + if test -r "$i/"libtk${with_tcl_version}.a""; then + libtk=$i + break fi + done + + if test -r "${libtk}/libtk${with_tcl_version}.a" ; then + TK_LIB_SPEC="-L${libtk} -ltk${with_tcl_version}" + fi + fi + if test -z "${TK_LIB_SPEC}" ; then + + libtk="" + for i in ${possibles}; do + if test -r "$i/"libtk.a""; then + libtk=$i + break + fi + done + + if test -r "${libtk}/libtk.a" ; then + TK_LIB_SPEC="-L${libtk} -ltk" + fi + fi + if test -z "${TK_LIB_SPEC}" ; then + { echo "configure: error: ${tkconfig}/tkConfig.sh does not define TK_LIB_SPEC" 1>&2; exit 1; } + fi + ecos_tk_libs="${TK_LIB_SPEC} ${TK_LIBS}" + fi + fi fi - echo "$ac_t""-I${ecos_tcl_incdir} -L${ecos_tcl_libdir}" 1>&6 - + echo "$ac_t""-I${ecos_tcl_incdir} ${TCL_LIB_SPEC}" 1>&6 + if test "${TK_MAJOR_VERSION}" = "8" ; then @@ -1897,6 +1957,7 @@ s%@ecos_LIBS@%$ecos_LIBS%g s%@MSVC_SRCDIR@%$MSVC_SRCDIR%g s%@MSVC_TRUE@%$MSVC_TRUE%g s%@MSVC_FALSE@%$MSVC_FALSE%g +s%@ecos_tk_includes@%$ecos_tk_includes%g s%@ecos_tk_libs@%$ecos_tk_libs%g s%@ECOS_REPOSITORY@%$ECOS_REPOSITORY%g s%@PACKAGE_DIR@%$PACKAGE_DIR%g
--- a/packages/io/usb/slave/current/ChangeLog +++ b/packages/io/usb/slave/current/ChangeLog @@ -1,3 +1,8 @@ +2003-02-12 Bart Veer <bartv@ecoscentric.com> + + * host/Makefile.in, host/configure: + Regenerate after toplevel acinclude.m4 update + 2002-09-23 Bart Veer <bartv@ecoscentric.com> * host/configure.in:
--- a/packages/io/usb/slave/current/host/Makefile.in +++ b/packages/io/usb/slave/current/host/Makefile.in @@ -87,6 +87,7 @@ ecos_infra_incdir = @ecos_infra_incdir@ ecos_infra_libdir = @ecos_infra_libdir@ ecos_libcdl_incdir = @ecos_libcdl_incdir@ ecos_libcdl_libdir = @ecos_libcdl_libdir@ +ecos_tk_includes = @ecos_tk_includes@ ecos_tk_libs = @ecos_tk_libs@ AUTOMAKE_OPTIONS = 1.3 foreign
--- a/packages/io/usb/slave/current/host/configure +++ b/packages/io/usb/slave/current/host/configure @@ -19,13 +19,13 @@ ac_help="$ac_help ac_help="$ac_help --enable-ansi do an ANSI rather than a unicode build" ac_help="$ac_help + --with-tcl=<path> location of Tcl header and libraries" +ac_help="$ac_help --with-tcl-version=<vsn> version of Tcl to be used" ac_help="$ac_help --with-tcl-header=<path> location of Tcl header" ac_help="$ac_help --with-tcl-lib=<path> location of Tcl libraries" -ac_help="$ac_help - --with-tcl=<path> location of Tcl header and libraries" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -1435,6 +1435,7 @@ echo "configure:1434: checking "for Visu if test "${CC}" = "cl" ; then MSVC="yes" CXX="cl" + MSVC_SRCDIR=${srcdir} @@ -1443,7 +1444,7 @@ echo "configure:1434: 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 @@ -1469,7 +1470,7 @@ fi echo $ac_n "checking "the default compiler flags"""... $ac_c" 1>&6 -echo "configure:1473: checking "the default compiler flags"" >&5 +echo "configure:1474: checking "the default compiler flags"" >&5 ecosflags_enable_debug="no" # Check whether --enable-debug or --disable-debug was given. @@ -1568,60 +1569,42 @@ fi - ecos_tcl_version="" - ecos_tcl_incdir="" - ecos_tcl_libdir="" ecos_tk_libs="" ecos_tk_libdir="" - - echo $ac_n "checking for Tcl version""... $ac_c" 1>&6 -echo "configure:1580: checking for Tcl version" >&5 - # Check whether --with-tcl-version or --without-tcl-version was given. -if test "${with_tcl_version+set}" = set; then - withval="$with_tcl_version" - - ecos_tcl_version=${with_tcl_version} - -else - - if test "${MSVC}" = "yes" ; then - ecos_tcl_version=80 - elif test "${ac_cv_cygwin}" = "yes" ; then - ecos_tcl_version=80 - else - ecos_tcl_version="" - fi - -fi - - echo "$ac_t""${ecos_tcl_version}" 1>&6 - echo $ac_n "checking for Tcl installation""... $ac_c" 1>&6 -echo "configure:1602: checking for Tcl installation" >&5 - - # Check whether --with-tcl-header or --without-tcl-header was given. -if test "${with_tcl_header+set}" = set; then - withval="$with_tcl_header" - : -fi - - # Check whether --with-tcl-lib or --without-tcl-lib was given. -if test "${with_tcl_lib+set}" = set; then - withval="$with_tcl_lib" - : -fi - +echo "configure:1577: checking for Tcl installation" >&5 # Check whether --with-tcl or --without-tcl was given. if test "${with_tcl+set}" = set; then withval="$with_tcl" : fi + # Check whether --with-tcl-version or --without-tcl-version was given. +if test "${with_tcl_version+set}" = set; then + withval="$with_tcl_version" + : +fi - - if test "${MSVC}" = "yes" ; then + + if test "${MSVC}" = "yes" ; then + # Check whether --with-tcl-header or --without-tcl-header was given. +if test "${with_tcl_header+set}" = set; then + withval="$with_tcl_header" + : +fi + # Check whether --with-tcl-lib or --without-tcl-lib was given. +if test "${with_tcl_lib+set}" = set; then + withval="$with_tcl_lib" + : +fi + + ecos_tcl_incdir="" + ecos_tcl_libdir="" + if test "${with_tcl_version+set}" != set ; then + { echo "configure: error: You must specify a Tcl version using --with-tcl-version=<vsn>" 1>&2; exit 1; } + fi if test "${with_tcl_header+set}" = set ; then ecos_tcl_incdir=${with_tcl_header} elif test "${with_tcl+set}" = set ; then @@ -1629,20 +1612,6 @@ fi else { echo "configure: error: You must specify a Tcl installation with either --with-tcl=<path> or --with-tcl-header=<path>" 1>&2; exit 1; } fi - - if test \! -r "${ecos_tcl_incdir}/tcl.h" ; then - { echo "configure: error: unable to locate Tcl header file tcl.h" 1>&2; exit 1; } - fi - ecos_msvc_tcl_incdir="${ecos_tcl_incdir}" - - - - if test "${MSVC}" = "yes" ; then - ecos_msvc_tcl_incdir=`cygpath -w ${ecos_msvc_tcl_incdir} | tr \\\\\\\\ /` - fi - - ecos_INCLUDES="${ecos_INCLUDES} \"-I${ecos_msvc_tcl_incdir}\"" - if test "${with_tcl_lib+set}" = set; then ecos_tcl_libdir=${with_tcl_lib} elif test "${with_tcl+set}" = set; then @@ -1650,6 +1619,18 @@ fi else { echo "configure: error: You must specify a Tcl installation with either --with-tcl=<path> or --with-tcl-lib=<path>" 1>&2; exit 1; } fi + + if test \! -r "${ecos_tcl_incdir}/tcl.h" ; then + { echo "configure: error: unable to locate Tcl header file tcl.h" 1>&2; exit 1; } + fi + + + + + if test "${MSVC}" = "yes" ; then + ecos_tcl_incdir=`cygpath -w ${ecos_tcl_incdir} | tr \\\\\\\\ /` + fi + @@ -1657,71 +1638,150 @@ fi ecos_tcl_libdir=`cygpath -w ${ecos_tcl_libdir} | tr \\\\\\\\ /` fi - ecos_LIBS="${ecos_LIBS} tcl${ecos_tcl_version}.lib" + ecos_INCLUDES="${ecos_INCLUDES} \"-I${ecos_tcl_incdir}\"" + ecos_LIBS="${ecos_LIBS} tcl${with_tcl_version}.lib" ecos_LDADD="${ecos_LDADD} \"-libpath=${ecos_tcl_libdir}\"" ecos_tk_libs="" else - possibles="${with_tcl_header} ${with_tcl}/include ${prefix}/include /usr/include/tcl${ecos_tcl_version} /usr/include" - - ecos_tcl_incdir="" + possibles="" + if test "${with_tcl+set}" = set ; then + possibles="${with_tcl}/lib" + if test "${with_tcl_version+set}" = set ; then + possibles="${possibles} ${with_tcl}/lib/tcl${with_tcl_version}" + fi + fi + possibles="${possibles} ${prefix}/lib" + if test "${with_tcl_version+set}" = set ; then + possibles="${possibles} ${prefix}/lib/tcl${with_tcl_version}" + fi + possibles="${possibles} /usr/lib" + if test "${with_tcl_version+set}" = set ; then + possibles="${possibles} /usr/lib/tcl${with_tcl_version}" + fi + + tclconfig="" for i in ${possibles}; do - if test -r "$i/"tcl.h""; then - ecos_tcl_incdir=$i + if test -r "$i/"tclConfig.sh""; then + tclconfig=$i break fi done - if test \! -r "${ecos_tcl_incdir}/tcl.h" ; then - { echo "configure: error: unable to locate Tcl header file tcl.h" 1>&2; exit 1; } - else - if test "${ecos_tcl_incdir}" != "/usr/include" ; then - ecos_INCLUDES="${ecos_INCLUDES} -I${ecos_tcl_incdir}" - fi + if test \! -r "${tclconfig}/tclConfig.sh" ; then + { echo "configure: error: unable to locate Tcl configuration file tclConfig.sh" 1>&2; exit 1; } + else + . ${tclconfig}/tclConfig.sh + + if test -z "${TCL_INC_DIR}" ; then + ecos_tcl_incdir="${TCL_PREFIX}/include" + else + ecos_tcl_incdir="${TCL_INC_DIR}" + fi + if test \! -r "${ecos_tcl_incdir}/tcl.h" ; then + { echo "configure: error: unable to locate Tcl header file tcl.h" 1>&2; exit 1; } + else + if test "${ecos_tcl_incdir}" != "/usr/include" ; then + ecos_INCLUDES="${ecos_INCLUDES} -I${ecos_tcl_incdir}" + fi + fi + + if test -z "${TCL_LIB_SPEC}" -a "${with_tcl_version+set}" = set ; then + + libtcl="" + for i in ${possibles}; do + if test -r "$i/"libtcl${with_tcl_version}.a""; then + libtcl=$i + break fi - possibles="${with_tcl_lib} ${with_tcl}/lib ${libdir} ${prefix}/lib /usr/lib/tcl${ecos_tcl_version} /usr/lib" - - ecos_tcl_libdir="" + done + + if test -r "${libtcl}/libtcl${with_tcl_version}.a" ; then + TCL_LIB_SPEC="-L${libtcl} -ltcl${with_tcl_version}" + fi + fi + if test -z "${TCL_LIB_SPEC}" ; then + + libtcl="" for i in ${possibles}; do - if test -r "$i/"tclConfig.sh""; then - ecos_tcl_libdir=$i + if test -r "$i/"libtcl.a""; then + libtcl=$i break fi done - if test \! -r "${ecos_tcl_libdir}/tclConfig.sh" ; then - { 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} -ltcl${ecos_tcl_version} ${TCL_LIBS}" - ecos_LDADD="${ecos_LDADD} -L${ecos_tcl_libdir}" - fi + if test -r "${libtcl}/libtcl.a" ; then + TCL_LIB_SPEC="-L${libtcl} -ltcl" + fi + fi + if test -z "${TCL_LIB_SPEC}" ; then + { echo "configure: error: ${tclconfig}/tclConfig.sh does not define TCL_LIB_SPEC" 1>&2; exit 1; } + fi + ecos_LIBS="${ecos_LIBS} ${TCL_LIB_SPEC}" - possible_tk_libdir=`echo ${ecos_tcl_libdir} | sed -e 's,tcl,tk,'` - possibles="${ecos_tcl_libdir} ${possible_tk_libdir}" - - ecos_tk_libdir="" + possibles=`echo ${possibles} | sed -e 's,tcl,tk,g'` + + tkconfig="" for i in ${possibles}; do if test -r "$i/"tkConfig.sh""; then - ecos_tk_libdir=$i + tkconfig=$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_tk_libdir}/tkConfig.sh - 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 + if test \! -r "${tkconfig}/tkConfig.sh" ; then + { echo "configure: error: unable to locate Tk config file tkConfig.sh" 1>&2; exit 1; } + else + . ${tkconfig}/tkConfig.sh + if test -z "${TK_INC_DIR}" ; then + if test "${TK_PREFIX}" = "/usr" ; then + ecos_tk_includes="${TK_XINCLUDES}" + else + ecos_tk_includes="-I${TK_PREFIX}/include ${TK_XINCLUDES}" + fi + else + ecos_tk_includes="-I${TK_INC_DIR} ${TK_XINCLUDES}" + fi + + if test -z "${TK_LIB_SPEC}" -a "${with_tcl_version+set}" = set ; then + + libtk="" + for i in ${possibles}; do + if test -r "$i/"libtk${with_tcl_version}.a""; then + libtk=$i + break fi + done + + if test -r "${libtk}/libtk${with_tcl_version}.a" ; then + TK_LIB_SPEC="-L${libtk} -ltk${with_tcl_version}" + fi + fi + if test -z "${TK_LIB_SPEC}" ; then + + libtk="" + for i in ${possibles}; do + if test -r "$i/"libtk.a""; then + libtk=$i + break + fi + done + + if test -r "${libtk}/libtk.a" ; then + TK_LIB_SPEC="-L${libtk} -ltk" + fi + fi + if test -z "${TK_LIB_SPEC}" ; then + { echo "configure: error: ${tkconfig}/tkConfig.sh does not define TK_LIB_SPEC" 1>&2; exit 1; } + fi + ecos_tk_libs="${TK_LIB_SPEC} ${TK_LIBS}" + fi + fi fi - echo "$ac_t""-I${ecos_tcl_incdir} -L${ecos_tcl_libdir}" 1>&6 - + echo "$ac_t""-I${ecos_tcl_incdir} ${TCL_LIB_SPEC}" 1>&6 + if test "${TK_MAJOR_VERSION}" = "8" ; then @@ -1732,7 +1792,7 @@ fi fi if test "${SUPPORTED}" = "yes" ; then echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1736: checking how to run the C preprocessor" >&5 +echo "configure:1796: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1747,13 +1807,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 1751 "configure" +#line 1811 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1757: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1817: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1764,13 +1824,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 1768 "configure" +#line 1828 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1774: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1834: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1781,13 +1841,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 1785 "configure" +#line 1845 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1791: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1851: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1815,17 +1875,17 @@ for ac_hdr in "linux/usb.h" "linux/usbde do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1819: checking for $ac_hdr" >&5 +echo "configure:1879: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1824 "configure" +#line 1884 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1829: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1889: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2054,6 +2114,7 @@ s%@ECOS_REPOSITORY@%$ECOS_REPOSITORY%g s%@PACKAGE_DIR@%$PACKAGE_DIR%g s%@PACKAGE_VERSION@%$PACKAGE_VERSION%g s%@PACKAGE_INSTALL@%$PACKAGE_INSTALL%g +s%@ecos_tk_includes@%$ecos_tk_includes%g s%@ecos_tk_libs@%$ecos_tk_libs%g s%@CPP@%$CPP%g s%@SUPPORTED_TRUE@%$SUPPORTED_TRUE%g