Index: build/pre.sh ================================================================== --- build/pre.sh +++ build/pre.sh @@ -2,11 +2,10 @@ ./kitcreator distclean KITSHROOTDIR="$(ls -1d kitsh/buildsrc/kitsh-*/)" export KITSHROOTDIR - ( cd "${KITSHROOTDIR}" || exit 1 autoconf; autoheader rm -rf autom4te.cache @@ -14,11 +13,26 @@ ./configure || exit 1 make boot.tcl.h make zipvfs.tcl.h + make distclean +) || exit 1 + +KITDLLROOTDIR="$(ls -1d kitdll/buildsrc/kitdll-*/)" +export KITDLLROOTDIR +( + cd "${KITDLLROOTDIR}" || exit 1 + + autoconf; autoheader + rm -rf autom4te.cache + rm -f *~ + + ./configure || exit 1 + make vfs_kitdll.tcl.h || exit 1 + make distclean ) || exit 1 rm -rf tcl/patchscripts/ find . -name '.*.sw?' -type f | xargs rm -f Index: kitdll/buildsrc/kitdll-0.0/Makefile.in ================================================================== --- kitdll/buildsrc/kitdll-0.0/Makefile.in +++ kitdll/buildsrc/kitdll-0.0/Makefile.in @@ -2,11 +2,11 @@ CFLAGS = @CFLAGS@ @SHOBJFLAGS@ -Wall CPPFLAGS = @CPPFLAGS@ @DEFS@ -DKITDLL_MAKE_LOADABLE=1 LDFLAGS = @LDFLAGS@ SHOBJLDFLAGS = @SHOBJLDFLAGS@ LIBS = @LIBS@ -STATICLIBS = @TCL_LIB_SPEC@ ../../../tclvfs/inst/lib/vfs1.3/libvfs1.3.a +STATICLIBS = @TCL_LIB_SPEC@ @ARCHS@ OBJS = vfs_kitdll_data_tcl.o kitInit.o rechan.o pwb.o TCLSH_NATIVE = tclsh # Default target all: libtcl.@SHOBJEXT@ @@ -45,7 +45,9 @@ distclean: clean rm -f config.status config.log rm -f *~ rm -f Makefile + +mrproper: distclean .PHONY: all clean distclean Index: kitdll/buildsrc/kitdll-0.0/aclocal.m4 ================================================================== --- kitdll/buildsrc/kitdll-0.0/aclocal.m4 +++ kitdll/buildsrc/kitdll-0.0/aclocal.m4 @@ -213,5 +213,23 @@ cygwin*) CFLAGS="${CFLAGS} -mms-bitfields" ;; esac ]) + +AC_DEFUN(DC_FIND_TCLKIT_LIBS, [ + DC_SETUP_TCL_PLAT_DEFS + + for proj in tclvfs; do + AC_MSG_CHECKING([for libraries required for ${proj}]) + + libdir="../../../${proj}/inst" + libfiles="`find "${libdir}" -name '*.a' 2>/dev/null | tr "\n" ' '`" + libfilesnostub="`find "${libdir}" -name '*.a' 2>/dev/null | grep -v 'stub' | tr "\n" ' '`" + + ARCHS="${ARCHS} ${libfiles}" + + AC_MSG_RESULT([${libfiles}]) + done + + AC_SUBST(ARCHS) +]) Index: kitdll/buildsrc/kitdll-0.0/configure.ac ================================================================== --- kitdll/buildsrc/kitdll-0.0/configure.ac +++ kitdll/buildsrc/kitdll-0.0/configure.ac @@ -8,11 +8,10 @@ AC_AIX AC_GNU_SOURCE dnl Determine system information DC_CHK_OS_INFO -DC_SETUP_TCL_PLAT_DEFS dnl Find the appropriate libraries to link to AC_SEARCH_LIBS(acos, m,, [ AC_MSG_WARN([Couldn't find acos (normally in libm)!]) ]) AC_SEARCH_LIBS(dlsym, dl,, [ AC_MSG_WARN([Couldn't find dlsym (normally in libdl)!]) ]) @@ -26,12 +25,15 @@ SAVE_LIBS="${LIBS}" LIBS="${ARCHS} ${LIBS}" dnl Check for the ability to get the current system encoding AC_CHECK_FUNCS(Tcl_GetEncodingNameFromEnvironment Tcl_SetSystemEncoding) LIBS="${SAVE_LIBS}" + +dnl Find required libs +DC_FIND_TCLKIT_LIBS dnl Check for optional headers AC_HEADER_STDC AC_CHECK_HEADERS(unistd.h string.h strings.h) dnl Produce output AC_OUTPUT(Makefile)