# HG changeset patch # User bartv # Date 1032722368 0 # Node ID 3f4258400ba5d57dc4b4a2d4f4f9c0e0a8e37778 # Parent 2ac3cfd6ed44774216d514d60e28ec16fbc4c965 Fix host-side configury problems which can occur if you are not using the system installation of Tcl diff --git a/README.host b/README.host --- a/README.host +++ b/README.host @@ -90,9 +90,12 @@ testing. Much of the host-side software has a dependency on Tcl. This is not supplied with the sources since many users will already have a -suitable installation, for example it is shipped as standard with -all major Linux distributions. Any release of Tcl from 8.0 onwards -should be usable. +suitable installation, for example it is shipped as standard with all +major Linux distributions. The generic host-side software should work +with any release of Tcl from 8.0 onwards. The package-specific +software requires a more recent version, 8.3 or later. If no suitable +Tcl installation is available then the configure step will still +succeed but some of the package-specific software will not be built. There are two main approaches to building the host-side software: @@ -218,6 +221,13 @@ 3) --with-tcl= $ configure --with-tcl=/usr/local/scriptics --with-tcl-version=8.1 + 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. + Following the configure step the build tree should be set up correctly. All that remains is the actual build and install: diff --git a/acsupport/ChangeLog b/acsupport/ChangeLog --- a/acsupport/ChangeLog +++ b/acsupport/ChangeLog @@ -1,3 +1,10 @@ +2002-09-22 Bart Veer + + * acinclude.m4: + Add the Tcl library path to ecos_LDADD (patch provided by Andrew + Lunn). Also add a reminder about ecos_tcl_version issues and + fix up Tk support. + 2002-08-27 Robin Farine * acinclude.m4 (ECOS_PATH_TCL): having found tclConfig.sh in diff --git a/acsupport/acinclude.m4 b/acsupport/acinclude.m4 --- a/acsupport/acinclude.m4 +++ b/acsupport/acinclude.m4 @@ -405,6 +405,7 @@ AC_DEFUN(ECOS_PATH_TCL, [ 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 @@ -501,7 +502,19 @@ AC_DEFUN(ECOS_PATH_TCL, [ 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 possible_tk_libdir=`echo ${ecos_tcl_libdir} | sed -e 's,tcl,tk,'` @@ -511,7 +524,7 @@ AC_DEFUN(ECOS_PATH_TCL, [ AC_MSG_ERROR(unable to locate Tk config file tkConfig.sh) else . ${ecos_tk_libdir}/tkConfig.sh - ecos_tk_libs="-ltk${ecos_tcl_version} ${TK_LIBS}" + 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 diff --git a/host/libcdl/configure b/host/libcdl/configure --- a/host/libcdl/configure +++ b/host/libcdl/configure @@ -1943,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} -ltcl${ecos_tcl_version} ${TCL_LIBS}" + ecos_LIBS="${ecos_LIBS} -ltcl${ecos_tcl_version} ${TCL_LIBS}" ecos_LDADD="${ecos_LDADD} -L${ecos_tcl_libdir}" fi @@ -1962,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="-ltk${ecos_tcl_version} ${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 @@ -1972,7 +1972,6 @@ fi echo "$ac_t""-I${ecos_tcl_incdir} -L${ecos_tcl_libdir}" 1>&6 - @@ -2146,7 +2145,6 @@ 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_libs@%$ecos_tk_libs%g -s%@ecos_tk_libdir@%$ecos_tk_libdir%g CEOF EOF diff --git a/host/tools/configtool/standalone/common/configure b/host/tools/configtool/standalone/common/configure --- a/host/tools/configtool/standalone/common/configure +++ b/host/tools/configtool/standalone/common/configure @@ -1926,10 +1926,11 @@ fi 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:1933: checking for Tcl version" >&5 +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" @@ -1951,7 +1952,7 @@ fi echo "$ac_t""${ecos_tcl_version}" 1>&6 echo $ac_n "checking for Tcl installation""... $ac_c" 1>&6 -echo "configure:1955: checking for Tcl installation" >&5 +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 @@ -2047,7 +2048,8 @@ 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} -ltcl${ecos_tcl_version} ${TCL_LIBS}" + ecos_LIBS="${ecos_LIBS} -ltcl${ecos_tcl_version} ${TCL_LIBS}" + ecos_LDADD="${ecos_LDADD} -L${ecos_tcl_libdir}" fi possible_tk_libdir=`echo ${ecos_tcl_libdir} | sed -e 's,tcl,tk,'` @@ -2065,7 +2067,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="-ltk${ecos_tcl_version} ${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 diff --git a/packages/devs/eth/synth/ecosynth/current/ChangeLog b/packages/devs/eth/synth/ecosynth/current/ChangeLog --- a/packages/devs/eth/synth/ecosynth/current/ChangeLog +++ b/packages/devs/eth/synth/ecosynth/current/ChangeLog @@ -1,3 +1,9 @@ +2002-09-22 Bart Veer + + * host/configure.in: + Remove Tcl-related checks, the ethernet package only requires + the functionality of the architectural HAL support + 2002-08-07 Bart Veer * synthetic target ethernet driver package created diff --git a/packages/devs/eth/synth/ecosynth/current/host/configure b/packages/devs/eth/synth/ecosynth/current/host/configure --- a/packages/devs/eth/synth/ecosynth/current/host/configure +++ b/packages/devs/eth/synth/ecosynth/current/host/configure @@ -18,14 +18,6 @@ ac_help="$ac_help --enable-debug do a debug rather than a release build" ac_help="$ac_help --enable-ansi do an ANSI rather than a unicode build" -ac_help="$ac_help - --with-tcl-version= version of Tcl to be used" -ac_help="$ac_help - --with-tcl-header= location of Tcl header" -ac_help="$ac_help - --with-tcl-lib= location of Tcl libraries" -ac_help="$ac_help - --with-tcl= location of Tcl header and libraries" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -559,7 +551,7 @@ ac_configure=$ac_aux_dir/configure # Thi echo $ac_n "checking that a separate build tree is being used""... $ac_c" 1>&6 -echo "configure:563: checking that a separate build tree is being used" >&5 +echo "configure:555: checking that a separate build tree is being used" >&5 ecos_cwd=`/bin/pwd` if test "${srcdir}" = "." ; then srcdir=${ecos_cwd} @@ -578,7 +570,7 @@ else { echo "configure: error: can not r fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:582: checking host system type" >&5 +echo "configure:574: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -610,7 +602,7 @@ echo "$ac_t""$host" 1>&6 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:614: checking for a BSD compatible install" >&5 +echo "configure:606: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -663,7 +655,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:667: checking whether build environment is sane" >&5 +echo "configure:659: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -720,7 +712,7 @@ test "$program_suffix" != NONE && test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:724: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:716: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -759,7 +751,7 @@ fi missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:763: checking for working aclocal" >&5 +echo "configure:755: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -772,7 +764,7 @@ else fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:776: checking for working autoconf" >&5 +echo "configure:768: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -785,7 +777,7 @@ else fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:789: checking for working automake" >&5 +echo "configure:781: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -798,7 +790,7 @@ else fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:802: checking for working autoheader" >&5 +echo "configure:794: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -811,7 +803,7 @@ else fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:815: checking for working makeinfo" >&5 +echo "configure:807: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -825,7 +817,7 @@ fi echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:829: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:821: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -853,20 +845,11 @@ case "${host}" in * ) SUPPORTED="no" esac - -if test "${SUPPORTED}" = "yes"; then - SUPPORTED_TRUE= - SUPPORTED_FALSE='#' -else - SUPPORTED_TRUE='#' - SUPPORTED_FALSE= -fi - if test "${SUPPORTED}" = "yes" ; then # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:870: checking for $ac_word" >&5 +echo "configure:853: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -896,7 +879,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:900: checking for $ac_word" >&5 +echo "configure:883: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -947,7 +930,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:951: checking for $ac_word" >&5 +echo "configure:934: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -979,7 +962,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:983: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:966: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -990,12 +973,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 994 "configure" +#line 977 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1021,12 +1004,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1025: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1008: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1030: checking whether we are using GNU C" >&5 +echo "configure:1013: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1035,7 +1018,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1039: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1022: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1054,7 +1037,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1058: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1041: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1090,7 +1073,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1094: checking for $ac_word" >&5 +echo "configure:1077: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1122,7 +1105,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1126: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1109: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1133,12 +1116,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 1137 "configure" +#line 1120 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:1142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1164,12 +1147,12 @@ if test $ac_cv_prog_cxx_works = no; then { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1168: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1151: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1173: checking whether we are using GNU C++" >&5 +echo "configure:1156: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1178,7 +1161,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1182: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1165: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -1197,7 +1180,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}" ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1201: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1184: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1238,7 +1221,7 @@ for ac_declaration in \ 'void exit (int);' do cat > conftest.$ac_ext < $ac_declaration @@ -1246,7 +1229,7 @@ int main() { exit (42); ; return 0; } EOF -if { (eval echo configure:1250: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1233: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -1256,14 +1239,14 @@ else fi rm -f conftest* cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1250: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* break else @@ -1280,13 +1263,13 @@ fi echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:1284: checking for object suffix" >&5 +echo "configure:1267: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:1290: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1273: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -1304,12 +1287,12 @@ OBJEXT=$ac_cv_objext ac_objext=$ac_cv_objext echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:1308: checking for Cygwin environment" >&5 +echo "configure:1291: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1307: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -1337,19 +1320,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6 CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:1341: checking for mingw32 environment" >&5 +echo "configure:1324: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1336: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -1368,7 +1351,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=y echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1372: checking for executable suffix" >&5 +echo "configure:1355: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1378,7 +1361,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1416,7 +1399,7 @@ ac_exeext=$EXEEXT echo $ac_n "checking "for Visual C++"""... $ac_c" 1>&6 -echo "configure:1420: checking "for Visual C++"" >&5 +echo "configure:1403: checking "for Visual C++"" >&5 MSVC="no"; if test "${CC}" = "cl" ; then MSVC="yes" @@ -1455,7 +1438,7 @@ fi echo $ac_n "checking "the default compiler flags"""... $ac_c" 1>&6 -echo "configure:1459: checking "the default compiler flags"" >&5 +echo "configure:1442: checking "the default compiler flags"" >&5 ecosflags_enable_debug="no" # Check whether --enable-debug or --disable-debug was given. @@ -1514,171 +1497,6 @@ fi echo "$ac_t""done" 1>&6 - - - - - - - ecos_tcl_version="" - ecos_tcl_incdir="" - ecos_tcl_libdir="" - ecos_tk_libs="" - - - echo $ac_n "checking for Tcl version""... $ac_c" 1>&6 -echo "configure:1531: 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:1553: 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 - - # Check whether --with-tcl or --without-tcl was given. -if test "${with_tcl+set}" = set; then - withval="$with_tcl" - : -fi - - - - if test "${MSVC}" = "yes" ; then - - if test "${with_tcl_header+set}" = set ; then - ecos_tcl_incdir=${with_tcl_header} - elif test "${with_tcl+set}" = set ; then - ecos_tcl_incdir="${with_tcl}/include" - else - { echo "configure: error: You must specify a Tcl installation with either --with-tcl= or --with-tcl-header=" 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 - ecos_tcl_libdir="${with_tcl}/lib" - else - { echo "configure: error: You must specify a Tcl installation with either --with-tcl= or --with-tcl-lib=" 1>&2; exit 1; } - fi - - - - if test "${MSVC}" = "yes" ; then - ecos_tcl_libdir=`cygpath -w ${ecos_tcl_libdir} | tr \\\\\\\\ /` - fi - - ecos_LIBS="${ecos_LIBS} tcl${ecos_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="" - for i in ${possibles}; do - if test -r "$i/"tcl.h""; then - ecos_tcl_incdir=$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 - fi - possibles="${with_tcl_lib} ${with_tcl}/lib ${libdir} ${prefix}/lib /usr/lib/tcl$${ecos_tcl_version} /usr/lib" - - ecos_tcl_libdir="" - for i in ${possibles}; do - if test -r "$i/"tclConfig.sh""; then - ecos_tcl_libdir=$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}" - fi - - possible_tk_libdir=`echo ${ecos_tcl_libdir} | sed -e 's,tcl,tk,'` - possibles="${ecos_tcl_libdir} ${possible_tk_libdir}" - - ecos_tk_libdir="" - for i in ${possibles}; do - if test -r "$i/"tkConfig.sh""; then - ecos_tk_libdir=$i - break - fi - done - - if test \! -r "${ecos_tk_libdir}/tkConfig.sh" ; then - { echo "configure: error: unable to locate Tk config file tkConfig.sh" 1>&2; exit 1; } - else - . ${ecos_tk_libdir}/tkConfig.sh - ecos_tk_libs="-ltk${ecos_tcl_version} ${TK_LIBS}" - for lib in ${TCL_LIBS} ; do - ecos_tk_libs=`echo ${ecos_tk_libs} | sed -e "s!${lib}!!"` - done - fi - fi - - echo "$ac_t""-I${ecos_tcl_incdir} -L${ecos_tcl_libdir}" 1>&6 - - - - if test "${TK_MAJOR_VERSION}" = "8" ; then - if test ${TK_MINOR_VERSION} -lt 3 ; then - { echo "configure: error: The synthetic target ethernet support requires at least version 8.3 of Tcl/Tk" 1>&2; exit 1; } - fi - fi package_dir=`cd ${srcdir} && /bin/pwd` @@ -1716,6 +1534,16 @@ fi fi + +if test "${SUPPORTED}" = "yes"; then + SUPPORTED_TRUE= + SUPPORTED_FALSE='#' +else + SUPPORTED_TRUE='#' + SUPPORTED_FALSE= +fi + + trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -1880,8 +1708,6 @@ s%@SET_MAKE@%$SET_MAKE%g s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g s%@MAINT@%$MAINT%g -s%@SUPPORTED_TRUE@%$SUPPORTED_TRUE%g -s%@SUPPORTED_FALSE@%$SUPPORTED_FALSE%g s%@CC@%$CC%g s%@CXX@%$CXX%g s%@OBJEXT@%$OBJEXT%g @@ -1894,11 +1720,12 @@ 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_libs@%$ecos_tk_libs%g 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%@SUPPORTED_TRUE@%$SUPPORTED_TRUE%g +s%@SUPPORTED_FALSE@%$SUPPORTED_FALSE%g CEOF EOF diff --git a/packages/devs/eth/synth/ecosynth/current/host/configure.in b/packages/devs/eth/synth/ecosynth/current/host/configure.in --- a/packages/devs/eth/synth/ecosynth/current/host/configure.in +++ b/packages/devs/eth/synth/ecosynth/current/host/configure.in @@ -62,7 +62,6 @@ case "${host}" in i[[34567]]86-*-linux-gnu* ) SUPPORTED="yes";; * ) SUPPORTED="no" esac -AM_CONDITIONAL(SUPPORTED, test "${SUPPORTED}" = "yes") if test "${SUPPORTED}" = "yes" ; then AC_PROG_CC @@ -71,20 +70,11 @@ if test "${SUPPORTED}" = "yes" ; then AC_EXEEXT ECOS_PROG_MSVC ECOS_PROG_STANDARD_COMPILER_FLAGS - - ECOS_PATH_TCL - dnl Check that the version of tk is sufficiently recent. - dnl For example the text widget's tag -elide facility was - dnl added between 8.2 and 8.3. Initial development of - dnl the synthetic target used 8.3.1 - if test "${TK_MAJOR_VERSION}" = "8" ; then - if test ${TK_MINOR_VERSION} -lt 3 ; then - AC_MSG_ERROR([The synthetic target ethernet support requires at least version 8.3 of Tcl/Tk]) - fi - fi ECOS_PACKAGE_DIRS fi +AM_CONDITIONAL(SUPPORTED, test "${SUPPORTED}" = "yes") + dnl There is no real need for a config.h file at this time, since the code dnl is specific to x86 Linux. This may change in future. dnl AM_CONFIG_HEADER(config.h:config.h.in) diff --git a/packages/hal/synth/arch/current/ChangeLog b/packages/hal/synth/arch/current/ChangeLog --- a/packages/hal/synth/arch/current/ChangeLog +++ b/packages/hal/synth/arch/current/ChangeLog @@ -1,3 +1,10 @@ +2002-09-22 Bart Veer + + * host/configure.in: + If the installed version of Tcl is too old, issue a warning and + suppress the build, rather than fail. Other bits of the system, + e.g. the generic host-side tools, can still be built. + 2002-09-21 Bart Veer * host/ecosynth.c: diff --git a/packages/hal/synth/arch/current/host/configure b/packages/hal/synth/arch/current/host/configure --- a/packages/hal/synth/arch/current/host/configure +++ b/packages/hal/synth/arch/current/host/configure @@ -853,20 +853,11 @@ case "${host}" in * ) SUPPORTED="no" esac - -if test "${SUPPORTED}" = "yes"; then - SUPPORTED_TRUE= - SUPPORTED_FALSE='#' -else - SUPPORTED_TRUE='#' - SUPPORTED_FALSE= -fi - if test "${SUPPORTED}" = "yes" ; then # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:870: checking for $ac_word" >&5 +echo "configure:861: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -896,7 +887,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:900: checking for $ac_word" >&5 +echo "configure:891: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -947,7 +938,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:951: checking for $ac_word" >&5 +echo "configure:942: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -979,7 +970,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:983: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:974: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -990,12 +981,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 994 "configure" +#line 985 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1021,12 +1012,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1025: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1016: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1030: checking whether we are using GNU C" >&5 +echo "configure:1021: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1035,7 +1026,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1039: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1030: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1054,7 +1045,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1058: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1049: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1090,7 +1081,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1094: checking for $ac_word" >&5 +echo "configure:1085: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1122,7 +1113,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1126: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1117: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1133,12 +1124,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 1137 "configure" +#line 1128 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:1142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1164,12 +1155,12 @@ if test $ac_cv_prog_cxx_works = no; then { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1168: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1159: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1173: checking whether we are using GNU C++" >&5 +echo "configure:1164: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1178,7 +1169,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1182: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1173: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -1197,7 +1188,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}" ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1201: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1192: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1238,7 +1229,7 @@ for ac_declaration in \ 'void exit (int);' do cat > conftest.$ac_ext < $ac_declaration @@ -1246,7 +1237,7 @@ int main() { exit (42); ; return 0; } EOF -if { (eval echo configure:1250: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1241: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -1256,14 +1247,14 @@ else fi rm -f conftest* cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1258: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* break else @@ -1280,13 +1271,13 @@ fi echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:1284: checking for object suffix" >&5 +echo "configure:1275: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:1290: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1281: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -1304,12 +1295,12 @@ OBJEXT=$ac_cv_objext ac_objext=$ac_cv_objext echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:1308: checking for Cygwin environment" >&5 +echo "configure:1299: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1315: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -1337,19 +1328,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6 CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:1341: checking for mingw32 environment" >&5 +echo "configure:1332: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1344: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -1368,7 +1359,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=y echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1372: checking for executable suffix" >&5 +echo "configure:1363: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1378,7 +1369,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1416,7 +1407,7 @@ ac_exeext=$EXEEXT echo $ac_n "checking "for Visual C++"""... $ac_c" 1>&6 -echo "configure:1420: checking "for Visual C++"" >&5 +echo "configure:1411: checking "for Visual C++"" >&5 MSVC="no"; if test "${CC}" = "cl" ; then MSVC="yes" @@ -1455,7 +1446,7 @@ fi echo $ac_n "checking "the default compiler flags"""... $ac_c" 1>&6 -echo "configure:1459: checking "the default compiler flags"" >&5 +echo "configure:1450: checking "the default compiler flags"" >&5 ecosflags_enable_debug="no" # Check whether --enable-debug or --disable-debug was given. @@ -1524,10 +1515,11 @@ fi 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:1531: checking for Tcl version" >&5 +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" @@ -1549,7 +1541,7 @@ fi echo "$ac_t""${ecos_tcl_version}" 1>&6 echo $ac_n "checking for Tcl installation""... $ac_c" 1>&6 -echo "configure:1553: checking for Tcl installation" >&5 +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 @@ -1645,7 +1637,8 @@ 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} -ltcl${ecos_tcl_version} ${TCL_LIBS}" + ecos_LIBS="${ecos_LIBS} -ltcl${ecos_tcl_version} ${TCL_LIBS}" + ecos_LDADD="${ecos_LDADD} -L${ecos_tcl_libdir}" fi possible_tk_libdir=`echo ${ecos_tcl_libdir} | sed -e 's,tcl,tk,'` @@ -1663,7 +1656,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="-ltk${ecos_tcl_version} ${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 @@ -1676,7 +1669,9 @@ fi if test "${TK_MAJOR_VERSION}" = "8" ; then if test ${TK_MINOR_VERSION} -lt 3 ; then - { echo "configure: error: The synthetic target support requires at least version 8.3 of Tcl/Tk" 1>&2; exit 1; } + echo "configure: warning: The synthetic target support requires at least version 8.3 of Tcl/Tk" 1>&2 + echo "configure: warning: Synthetic target host-side support will not be built" 1>&2 + SUPPORTED="no" fi fi @@ -1716,6 +1711,16 @@ fi fi + +if test "${SUPPORTED}" = "yes"; then + SUPPORTED_TRUE= + SUPPORTED_FALSE='#' +else + SUPPORTED_TRUE='#' + SUPPORTED_FALSE= +fi + + trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -1880,8 +1885,6 @@ s%@SET_MAKE@%$SET_MAKE%g s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g s%@MAINT@%$MAINT%g -s%@SUPPORTED_TRUE@%$SUPPORTED_TRUE%g -s%@SUPPORTED_FALSE@%$SUPPORTED_FALSE%g s%@CC@%$CC%g s%@CXX@%$CXX%g s%@OBJEXT@%$OBJEXT%g @@ -1899,6 +1902,8 @@ 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%@SUPPORTED_TRUE@%$SUPPORTED_TRUE%g +s%@SUPPORTED_FALSE@%$SUPPORTED_FALSE%g CEOF EOF diff --git a/packages/hal/synth/arch/current/host/configure.in b/packages/hal/synth/arch/current/host/configure.in --- a/packages/hal/synth/arch/current/host/configure.in +++ b/packages/hal/synth/arch/current/host/configure.in @@ -63,7 +63,6 @@ case "${host}" in i[[34567]]86-*-linux-gnu* ) SUPPORTED="yes";; * ) SUPPORTED="no" esac -AM_CONDITIONAL(SUPPORTED, test "${SUPPORTED}" = "yes") if test "${SUPPORTED}" = "yes" ; then AC_PROG_CC @@ -80,12 +79,16 @@ if test "${SUPPORTED}" = "yes" ; then dnl the synthetic target used 8.3.1 if test "${TK_MAJOR_VERSION}" = "8" ; then if test ${TK_MINOR_VERSION} -lt 3 ; then - AC_MSG_ERROR([The synthetic target support requires at least version 8.3 of Tcl/Tk]) + AC_MSG_WARN([The synthetic target support requires at least version 8.3 of Tcl/Tk]) + AC_MSG_WARN([Synthetic target host-side support will not be built]) + SUPPORTED="no" fi fi ECOS_PACKAGE_DIRS fi +AM_CONDITIONAL(SUPPORTED, test "${SUPPORTED}" = "yes") + dnl There is no real need for a config.h file at this time, since the code dnl is specific to x86 Linux. This may change in future. dnl AM_CONFIG_HEADER(config.h:config.h.in) diff --git a/packages/io/usb/slave/current/host/configure b/packages/io/usb/slave/current/host/configure --- a/packages/io/usb/slave/current/host/configure +++ b/packages/io/usb/slave/current/host/configure @@ -1545,10 +1545,11 @@ fi 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:1552: checking for Tcl version" >&5 +echo "configure:1553: 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" @@ -1570,7 +1571,7 @@ fi echo "$ac_t""${ecos_tcl_version}" 1>&6 echo $ac_n "checking for Tcl installation""... $ac_c" 1>&6 -echo "configure:1574: checking for Tcl installation" >&5 +echo "configure:1575: checking for Tcl installation" >&5 # Check whether --with-tcl-header or --without-tcl-header was given. if test "${with_tcl_header+set}" = set; then @@ -1666,7 +1667,8 @@ 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} -ltcl${ecos_tcl_version} ${TCL_LIBS}" + ecos_LIBS="${ecos_LIBS} -ltcl${ecos_tcl_version} ${TCL_LIBS}" + ecos_LDADD="${ecos_LDADD} -L${ecos_tcl_libdir}" fi possible_tk_libdir=`echo ${ecos_tcl_libdir} | sed -e 's,tcl,tk,'` @@ -1684,7 +1686,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="-ltk${ecos_tcl_version} ${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