Diff

Differences From Artifact [2d66362eb1]:

To Artifact [6be18087ad]:


    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     37   	# Figure out if zlib compiled
    38         -	ZLIBDIR=$(cd "${OTHERPKGSDIR}/zlib/inst"; pwd)
           38  +	ZLIBDIR="$(cd "${OTHERPKGSDIR}/zlib/inst" 2>/dev/null && pwd)"
    39     39   	export ZLIBDIR
    40         -	if [ ! -f "${ZLIBDIR}/lib/libz.a" ]; then
           40  +	if [ -z "${ZLIBDIR}" -o ! -f "${ZLIBDIR}/lib/libz.a" ]; then
    41     41   		unset ZLIBDIR
    42     42   	fi
           43  +
           44  +	# Include extra objects as required
           45  +	## Initialize list of extra objects
           46  +	EXTRA_OBJS=""
           47  +
           48  +	## Tk Resources (needed for Win32 support)
           49  +	TKDIR="$(cd "${OTHERPKGSDIR}/tk/inst" && pwd)"
           50  +	TKRSRC="${TKDIR}/lib/tkbase.res.o"
           51  +	if [ -n "${TKDIR}" -a -f "${TKRSRC}" ]; then
           52  +		EXTRA_OBJS="${EXTRA_OBJS} ${TKRSRC}"
           53  +	fi
           54  +
           55  +	## Export to the environment, to be picked up by the "configure" script
           56  +	export EXTRA_OBJS
    43     57   
    44     58   	# Compile Kitsh
    45     59   	if [ -z "${ZLIBDIR}" ]; then
    46     60   		echo "./configure --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"
    47     61   
    48     62   		./configure --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
    49     63   	else