Index: kitsh/buildsrc/kitsh-0.0/aclocal.m4 ================================================================== --- kitsh/buildsrc/kitsh-0.0/aclocal.m4 +++ kitsh/buildsrc/kitsh-0.0/aclocal.m4 @@ -190,12 +190,19 @@ AC_MSG_CHECKING([for libraries required for ${proj}]) projlibfiles="`find "${projlibdir}" -name '*.a' 2>/dev/null | sort | tr "\n" ' '`" projlibfilesnostub="`find "${projlibdir}" -name '*.a' 2>/dev/null | grep -v 'stub' | tr "\n" ' '`" + projlibextra="" - AC_MSG_RESULT([${projlibfilesnostub}]) + for libfile in ${projlibfilesnostub}; do + if test -f "${libfile}.linkadd"; then + projlibextra="`cat "${libfile}.linkadd"`" + fi + done + + AC_MSG_RESULT([${projlibfilesnostub} ${projlibextra}]) hide_symbols="1" initialize="1" if test "${proj}" = "tcl"; then @@ -279,10 +286,11 @@ libs_init_funcs="${libs_init_funcs} ${lib_init_func}" fi fi ARCHS="${ARCHS} ${projlibfiles}" + LIBS="${LIBS} ${projlibextra}" done echo '' >> kitInit-libs.h echo 'static void _Tclkit_GenericLib_Init(void) {' >> kitInit-libs.h for lib_init_func in ${libs_init_funcs}; do @@ -292,10 +300,11 @@ echo ' return;' >> kitInit-libs.h echo '}' >> kitInit-libs.h AC_SUBST(ARCHS) AC_SUBST(STRIPLIBS) + AC_SUBST(LIBS) ]) AC_DEFUN(DC_SETUP_TCL_PLAT_DEFS, [ AC_CANONICAL_BUILD AC_CANONICAL_HOST