Check-in [75fa17d1eb]
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    156   
   157    157   AC_DEFUN(DC_FIND_TCLKIT_LIBS, [
   158    158   	DC_SETUP_TCL_PLAT_DEFS
   159    159   
   160    160   	dnl We will need this for the Tcl project, which we will always have
   161    161   	DC_CHECK_FOR_WHOLE_ARCHIVE
   162    162   
   163         -	for proj in mk4tcl tcl tclvfs tk; do
          163  +	for proj in mk4tcl tcl tclvfs tk zlib; do
   164    164   		AC_MSG_CHECKING([for libraries required for ${proj}])
   165    165   
   166    166   		projlibdir="../../../${proj}/inst"
   167    167   		projlibfiles="`find "${projlibdir}" -name '*.a' 2>/dev/null | tr "\n" ' '`"
   168    168   		projlibfilesnostub="`find "${projlibdir}" -name '*.a' 2>/dev/null | grep -v 'stub' | tr "\n" ' '`"
   169    169   
   170    170   		AC_MSG_RESULT([${projlibfilesnostub}])
................................................................................
   201    201   					AC_DEFINE_UNQUOTED(KIT_TK_VERSION, "${TK_VERSION}${TK_PATCH_LEVEL}", [Specify the version of Tk])
   202    202   				fi
   203    203   
   204    204   				if test "$host_os" = "mingw32msvc" -o "$host_os" = "mingw32"; then
   205    205   					AC_DEFINE(KITSH_NEED_WINMAIN, [1], [Define if you need WinMain (Windows)])
   206    206   					CFLAGS="${CFLAGS} -mwindows"
   207    207   				fi
          208  +
          209  +				DC_TEST_WHOLE_ARCHIVE_SHARED_LIB([$ARCHS $projlibfilesnostub], [
          210  +					projlibfiles="${projlibfilesnostub}"
          211  +				], [
          212  +					DC_TEST_WHOLE_ARCHIVE_SHARED_LIB([$ARCHS $projlibfiles], [
          213  +						projlibfiles="${projlibfiles}"
          214  +					])
          215  +				])
   208    216   
   209    217   				hide_symbols="0"
   210    218   			fi
   211    219   		fi
   212    220   
   213         -		ARCHS="${ARCHS} ${projlibfiles}"
   214         -
   215    221   		if test "${hide_symbols}" = "1"; then
   216    222   			STRIPLIBS="${STRIPLIBS} ${projlibfiles}"
   217    223   		fi
          224  +
          225  +		dnl Do not explicitly link to Zlib, that will happen elsewhere
          226  +		if test "${proj}" = "zlib"; then
          227  +			continue
          228  +		fi
          229  +
          230  +		ARCHS="${ARCHS} ${projlibfiles}"
   218    231   	done
   219    232   
   220    233   	AC_SUBST(ARCHS)
   221    234   	AC_SUBST(STRIPLIBS)
   222    235   ])
   223    236   
   224    237   AC_DEFUN(DC_SETUP_TCL_PLAT_DEFS, [

Modified kitsh/buildsrc/kitsh-0.0/configure.ac from [b28720a899] to [501466d9c8].

    35     35   AS_IF([test "$TARGET" = "tclkit"], [
    36     36   	dnl We have Tclkit
    37     37   
    38     38   	dnl Figure out how to statically link to libgcc, if needed
    39     39   	DC_STATIC_LIBGCC
    40     40   
    41     41   	dnl Specify local Appinit function
    42         -	AC_DEFINE(DTK_LOCAL_APPINIT, [TclKit_AppInit], [Tclkit appinit function])
           42  +	AC_DEFINE(TK_LOCAL_APPINIT, [TclKit_AppInit], [Tclkit appinit function])
    43     43   ], [
    44     44   	dnl We have KitDLL
    45     45   
    46     46   	dnl Determine system information
    47     47   	DC_CHK_OS_INFO
    48     48   
    49     49   	dnl Determine how to create a shared object