Differences From Artifact [f5f5688875]:
- File kitsh/buildsrc/kitsh-0.0/aclocal.m4 — part of check-in [a1a14e0aba] at 2011-05-23 10:53:53 on branch merge-kitdll-kitsh-common — Integrated KitDLL into KitSH (user: rkeene, size: 11314) [annotate] [blame] [check-ins using]
To Artifact [1f1678240f]:
- File
kitsh/buildsrc/kitsh-0.0/aclocal.m4
— part of check-in
[75fa17d1eb]
at
2011-05-23 15:33:54
on branch merge-kitdll-kitsh-common
— Corrected typo
Updated to weak zlib symbols
Updated to not link against stub archives for Tk as well as Tcl (user: rkeene, size: 11674) [annotate] [blame] [check-ins using] [more...]
︙ | ︙ | |||
156 157 158 159 160 161 162 | AC_DEFUN(DC_FIND_TCLKIT_LIBS, [ DC_SETUP_TCL_PLAT_DEFS dnl We will need this for the Tcl project, which we will always have DC_CHECK_FOR_WHOLE_ARCHIVE | | | 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 | AC_DEFUN(DC_FIND_TCLKIT_LIBS, [ DC_SETUP_TCL_PLAT_DEFS dnl We will need this for the Tcl project, which we will always have DC_CHECK_FOR_WHOLE_ARCHIVE for proj in mk4tcl tcl tclvfs tk zlib; do AC_MSG_CHECKING([for libraries required for ${proj}]) projlibdir="../../../${proj}/inst" projlibfiles="`find "${projlibdir}" -name '*.a' 2>/dev/null | tr "\n" ' '`" projlibfilesnostub="`find "${projlibdir}" -name '*.a' 2>/dev/null | grep -v 'stub' | tr "\n" ' '`" AC_MSG_RESULT([${projlibfilesnostub}]) |
︙ | ︙ | |||
201 202 203 204 205 206 207 208 209 210 211 212 | AC_DEFINE_UNQUOTED(KIT_TK_VERSION, "${TK_VERSION}${TK_PATCH_LEVEL}", [Specify the version of Tk]) fi if test "$host_os" = "mingw32msvc" -o "$host_os" = "mingw32"; then AC_DEFINE(KITSH_NEED_WINMAIN, [1], [Define if you need WinMain (Windows)]) CFLAGS="${CFLAGS} -mwindows" fi hide_symbols="0" fi fi | > > > > > > > > < < > > > > > > > | 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 | AC_DEFINE_UNQUOTED(KIT_TK_VERSION, "${TK_VERSION}${TK_PATCH_LEVEL}", [Specify the version of Tk]) fi if test "$host_os" = "mingw32msvc" -o "$host_os" = "mingw32"; then AC_DEFINE(KITSH_NEED_WINMAIN, [1], [Define if you need WinMain (Windows)]) CFLAGS="${CFLAGS} -mwindows" fi DC_TEST_WHOLE_ARCHIVE_SHARED_LIB([$ARCHS $projlibfilesnostub], [ projlibfiles="${projlibfilesnostub}" ], [ DC_TEST_WHOLE_ARCHIVE_SHARED_LIB([$ARCHS $projlibfiles], [ projlibfiles="${projlibfiles}" ]) ]) hide_symbols="0" fi fi if test "${hide_symbols}" = "1"; then STRIPLIBS="${STRIPLIBS} ${projlibfiles}" fi dnl Do not explicitly link to Zlib, that will happen elsewhere if test "${proj}" = "zlib"; then continue fi ARCHS="${ARCHS} ${projlibfiles}" done AC_SUBST(ARCHS) AC_SUBST(STRIPLIBS) ]) AC_DEFUN(DC_SETUP_TCL_PLAT_DEFS, [ |
︙ | ︙ |