Modified kitsh/build.sh from [9ac6c7313f] to [2d7f94aadf].

    30     30   (
    31     31   	cp -r 'buildsrc' 'build'
    32     32   	cd "${BUILDDIR}" || exit 1
    33     33   
    34     34   	# Cleanup, just incase the incoming directory was not pre-cleaned
    35     35   	${MAKE:-make} distclean >/dev/null 2>/dev/null
    36     36   
           37  +	# Create VFS directory
           38  +	mkdir "starpack.vfs"
           39  +	mkdir "starpack.vfs/lib"
           40  +
           41  +	## Copy in all built directories
           42  +	cp -r "${OTHERPKGSDIR}"/*/out/* 'starpack.vfs/'
           43  +
           44  +	## Rename the "vfs" package directory to what "boot.tcl" expects
           45  +	mv 'starpack.vfs/lib'/vfs* 'starpack.vfs/lib/vfs'
           46  +
           47  +	## Install "boot.tcl"
           48  +	cp 'boot.tcl' 'starpack.vfs/'
           49  +
    37     50   	# Figure out if zlib compiled (if not, the system zlib will be used and we
    38     51   	# will need to have that present)
    39     52   	ZLIBDIR="$(cd "${OTHERPKGSDIR}/zlib/inst" 2>/dev/null && pwd)"
    40     53   	export ZLIBDIR
    41     54   	if [ -z "${ZLIBDIR}" -o ! -f "${ZLIBDIR}/lib/libz.a" ]; then
    42     55   		unset ZLIBDIR
    43     56   	fi
................................................................................
    77     90   
    78     91   	echo "Running: ${MAKE:-make}"
    79     92   	${MAKE:-make} || exit 1
    80     93   
    81     94   	# Strip the kit of all symbols, if possible
    82     95   	"${STRIP:-strip}" kit >/dev/null 2>/dev/null
    83     96   
    84         -	# Create VFS directory
    85         -	mkdir "starpack.vfs"
    86         -	mkdir "starpack.vfs/lib"
    87         -
    88         -	## Copy in all built directories
    89         -	cp -r "${OTHERPKGSDIR}"/*/out/* 'starpack.vfs/'
    90         -
    91         -	## Rename the "vfs" package directory to what "boot.tcl" expects
    92         -	mv 'starpack.vfs/lib'/vfs* 'starpack.vfs/lib/vfs'
    93         -
    94         -	## Install "boot.tcl"
    95         -	cp 'boot.tcl' 'starpack.vfs/'
    96         -
    97     97   	# Intall VFS onto kit
    98     98   	## Determine if we have a Tclkit to do this work
    99     99   	TCLKIT="${TCLKIT:-tclkit}"
   100    100   	if echo 'exit 0' | "${TCLKIT}" >/dev/null 2>/dev/null; then
   101    101   		## Install using existing Tclkit
   102    102   		### Call installer
   103    103   		echo "Running: \"${TCLKIT}\" installvfs.tcl kit starpack.vfs \"${ENABLECOMPRESSION}\""

Modified kitsh/buildsrc/kitsh-0.0/aclocal.m4 from [53dc5eee75] to [c050f768b5].

   185    185   		fi
   186    186   	done
   187    187   
   188    188   	AC_SUBST(ARCHS)
   189    189   ])
   190    190   
   191    191   AC_DEFUN(DC_SETUP_TCL_PLAT_DEFS, [
          192  +	AC_CANONICAL_BUILD
   192    193   	AC_CANONICAL_HOST
   193    194     
   194    195   	AC_MSG_CHECKING(host operating system)
   195    196   	AC_MSG_RESULT($host_os)
   196    197     
   197    198   	case $host_os in
   198    199   		mingw32*)
................................................................................
   315    316       ])
   316    317     fi
   317    318   
   318    319     AC_MSG_RESULT($SHOBJLDFLAGS $SHOBJFLAGS)
   319    320   ])
   320    321   
   321    322   AC_DEFUN(DC_CHK_OS_INFO, [
          323  +	AC_CANONICAL_BUILD
   322    324   	AC_CANONICAL_HOST
          325  +
   323    326   	AC_SUBST(SHOBJEXT)
   324    327   	AC_SUBST(AREXT)
   325    328           AC_SUBST(SHOBJFLAGS)
   326    329           AC_SUBST(SHOBJLDFLAGS)
   327    330   
   328    331           AC_MSG_CHECKING(host operating system)
   329    332           AC_MSG_RESULT($host_os)

Modified kitsh/buildsrc/kitsh-0.0/configure.ac from [5f3b54111a] to [a823c6235c].

    28     28   ])
    29     29   AC_MSG_RESULT([$TARGET])
    30     30   
    31     31   dnl Find the appropriate libraries to link to
    32     32   AC_SEARCH_LIBS(acos, m,, [ AC_MSG_WARN([Couldn't find acos (normally in libm)!]) ])
    33     33   AC_SEARCH_LIBS(dlsym, dl,, [ AC_MSG_WARN([Couldn't find dlsym (normally in libdl)!]) ])
    34     34   
    35         -if test "x$TARGET" = "tclkit"; then
           35  +if test "$TARGET" = "tclkit"; then
    36     36   	dnl Figure out how to statically link to libgcc, if needed
    37     37   	DC_STATIC_LIBGCC
    38     38   else
    39     39   	dnl We have KitDLL
    40     40   
    41     41   	dnl Determine system information
    42     42   	DC_CHK_OS_INFO
................................................................................
    96     96   AC_ARG_WITH(zlib, AC_HELP_STRING([--with-zlib], [directory containing zlib]), [
    97     97   	CPPFLAGS="${CPPFLAGS} -I${with_zlib}/include -I${with_zlib}"
    98     98   	CFLAGS="${CFLAGS} -I${with_zlib}/include -I${with_zlib}"
    99     99   	LDFLAGS="${LDFLAGS} -L${with_zlib}/lib -L${with_zlib}"
   100    100   ])
   101    101   
   102    102   dnl Only needed for Tclkit
   103         -if test "x$TARGET" = "tclkit"; then
          103  +if test "$TARGET" = "tclkit"; then
   104    104   	DC_DO_STATIC_LINK_LIB(zlib, -lz,, [
   105    105   		DC_DO_STATIC_LINK_LIB(zlib, -lzlib,, [
   106    106   			AC_SEARCH_LIBS(inflate, z zlib,, [
   107    107   				AC_MSG_WARN([Couldn't find inflate (normally in zlib)!])
   108    108   			])
   109    109   		])
   110    110   	])
................................................................................
   149    149   			AC_MSG_ERROR([Unknown kit storage type: $enableval])
   150    150   			;;
   151    151   	esac
   152    152   ])
   153    153   AC_MSG_RESULT([$storage_mech])
   154    154   
   155    155   dnl Verify sanity of storage mechanism
   156         -if ! test "x$TARGET" = "tclkit"; then
          156  +if ! test "$TARGET" = "tclkit"; then
   157    157   	case "$storage_mech" in
   158    158   		auto|cvfs)
   159    159   			true
   160    160   			;;
   161    161   		*)
   162    162   			AC_MSG_ERROR([Only "cvfs" and "auto" are valid storage mechanisms when building KitDLL])
   163    163   			;;