Modified kitsh/buildsrc/kitsh-0.0/Makefile.in from [9c5abd59ed] to [06f1b2f40d].

     1      1   CC = @CC@
     2      2   CFLAGS = -Wall @CFLAGS@
     3      3   CPPFLAGS = @CPPFLAGS@
     4      4   LDFLAGS = @LDFLAGS@
     5      5   LIBS = @LIBS@
            6  +ARCHS = @ARCHS@
     6      7   OBJS = kitInit.o main.o pwb.o rechan.o zlib.o
     7         -ARCHS = ../../../mk4tcl/inst/lib/Mk4tcl/Mk4tcl.a ../../../tcl/inst/lib/libtcl8.4.a ../../../tclvfs/inst/lib/vfs1.3/libvfs1.3.a
     8      8   
     9      9   all: kit
    10     10   
    11     11   kit: $(OBJS) $(ARCHS)
    12     12   	$(CC) $(CPPFLAGS) $(CFLAGS) -o kit $(OBJS) $(ARCHS) $(LDFLAGS) $(LIBS)
    13     13   
    14     14   clean:

Modified kitsh/buildsrc/kitsh-0.0/aclocal.m4 from [03a71efe74] to [c2b5bbda30].

    22     22   	else
    23     23   		tclconfigsh="${with_tcl}/tclConfig.sh"
    24     24   	fi
    25     25   
    26     26   	if test -f "${tclconfigsh}"; then
    27     27   		source "${tclconfigsh}"
    28     28   
    29         -		CFLAGS="${CFLAGS} ${TCL_INCLUDE_SPEC} -I${TCL_SRC_DIR}/generic"
    30         -		CPPFLAGS="${CPPFLAGS} ${TCL_INCLUDE_SPEC} -I${TCL_SRC_DIR}/generic"
           29  +		CFLAGS="${CFLAGS} ${TCL_INCLUDE_SPEC} -I${TCL_SRC_DIR}/generic -I${TCL_SRC_DIR}/unix"
           30  +		CPPFLAGS="${CPPFLAGS} ${TCL_INCLUDE_SPEC} -I${TCL_SRC_DIR}/generic -I${TCL_SRC_DIR}/unix"
    31     31   		LDFLAGS="${LDFLAGS}"
    32     32   		LIBS="${LIBS} ${TCL_LIBS}"
    33     33   	fi
    34     34   
    35     35   	AC_SUBST(CFLAGS)
    36     36   	AC_SUBST(CPPFLAGS)
    37     37   	AC_SUBST(LDFLAGS)
................................................................................
    46     46   	STATICLIBCXX="-Wl,-Bstatic -lstdc++ -Wl,-Bdynamic"
    47     47   	LIBS="${LIBS} ${STATICLIBCXX}"
    48     48   
    49     49   	AC_SUBST(LIBS)
    50     50   
    51     51   	AC_MSG_RESULT([${STATICLIBCXX}])
    52     52   ])
           53  +
           54  +AC_DEFUN(DC_FIND_TCLKIT_LIBS, [
           55  +	for proj in mk4tcl tcl tclvfs; do
           56  +		AC_MSG_CHECKING([for libraries required for ${proj}])
           57  +
           58  +		libdir="../../../${proj}/inst"
           59  +		libfiles="`find "${libdir}" -name '*.a' | tr "\n" ' '`"
           60  +
           61  +		ARCHS="${ARCHS} ${libfiles}"
           62  +
           63  +		AC_MSG_RESULT([${libfiles}])
           64  +	done
           65  +
           66  +	AC_SUBST(ARCHS)
           67  +])

Modified kitsh/buildsrc/kitsh-0.0/configure.ac from [d1ba583817] to [ea43bce0fb].

    10     10   AC_GNU_SOURCE
    11     11   
    12     12   dnl Find the appropriate Tcl headers and libraries
    13     13   DC_DO_TCL
    14     14   
    15     15   dnl Find out how to statically link to libstdc++ (for Metakit)
    16     16   DC_DO_STATIC_LINK_LIBCXX
           17  +
           18  +dnl Find archives we need to link to
           19  +DC_FIND_TCLKIT_LIBS
    17     20   
    18     21   dnl Find the appropriate libraries to link to
    19     22   AC_SEARCH_LIBS(inflate, z zlib,, [ AC_MSG_WARN([Couldn't find inflate (normally in zlib)!]) ])
    20     23   AC_SEARCH_LIBS(acos, m,, [ AC_MSG_WARN([Couldn't find acos (normally in libm)!]) ])
    21     24   AC_SEARCH_LIBS(dlsym, dl,, [ AC_MSG_WARN([Couldn't find dlsym (normally in libdl)!]) ])
    22     25   
    23     26   dnl Produce output
    24     27   AC_OUTPUT(Makefile)