Overview
| Comment: | Corrected typo
Updated to weak zlib symbols Updated to not link against stub archives for Tk as well as Tcl |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | merge-kitdll-kitsh-common |
| Files: | files | file ages | folders |
| SHA1: | 75fa17d1ebbc7fa968693dda25287f96b2225a43 |
| User & Date: | rkeene on 2011-05-23 15:33:54 |
| Other Links: | manifest | tags |
Context
|
2011-05-23
| ||
| 17:30 | Updated location to build "tclsh" to coorespond to new location check-in: 3b0581b604 user: rkeene tags: merge-kitdll-kitsh-common | |
| 15:33 |
Corrected typo
Updated to weak zlib symbols Updated to not link against stub archives for Tk as well as Tcl check-in: 75fa17d1eb user: rkeene tags: merge-kitdll-kitsh-common | |
| 10:53 | Integrated KitDLL into KitSH check-in: a1a14e0aba user: rkeene tags: merge-kitdll-kitsh-common | |
Changes
Modified kitsh/buildsrc/kitsh-0.0/aclocal.m4 from [f5f5688875] to [1f1678240f].
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
...
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
|
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; 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}])
................................................................................
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
ARCHS="${ARCHS} ${projlibfiles}"
if test "${hide_symbols}" = "1"; then
STRIPLIBS="${STRIPLIBS} ${projlibfiles}"
fi
done
AC_SUBST(ARCHS)
AC_SUBST(STRIPLIBS)
])
AC_DEFUN(DC_SETUP_TCL_PLAT_DEFS, [
|
|
>
>
>
>
>
>
>
>
<
<
>
>
>
>
>
>
>
|
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
...
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_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}]) ................................................................................ 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, [ |
Modified kitsh/buildsrc/kitsh-0.0/configure.ac from [b28720a899] to [501466d9c8].
35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 |
AS_IF([test "$TARGET" = "tclkit"], [
dnl We have Tclkit
dnl Figure out how to statically link to libgcc, if needed
DC_STATIC_LIBGCC
dnl Specify local Appinit function
AC_DEFINE(DTK_LOCAL_APPINIT, [TclKit_AppInit], [Tclkit appinit function])
], [
dnl We have KitDLL
dnl Determine system information
DC_CHK_OS_INFO
dnl Determine how to create a shared object
|
| |
35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 |
AS_IF([test "$TARGET" = "tclkit"], [ dnl We have Tclkit dnl Figure out how to statically link to libgcc, if needed DC_STATIC_LIBGCC dnl Specify local Appinit function AC_DEFINE(TK_LOCAL_APPINIT, [TclKit_AppInit], [Tclkit appinit function]) ], [ dnl We have KitDLL dnl Determine system information DC_CHK_OS_INFO dnl Determine how to create a shared object |