Overview
| Comment: | Corrected inverted logic for static linking | 
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive | 
| Timelines: | family | ancestors | descendants | both | trunk | 
| Files: | files | file ages | folders | 
| SHA1: | 69081b236e550e85b24f53f105a92fbb | 
| User & Date: | rkeene on 2010-09-26 04:40:16 | 
| Other Links: | manifest | tags | 
Context
| 2010-09-26 | ||
| 04:40 | Added internal script to build Win32 tclkit for testing check-in: 6b5f7a6c29 user: rkeene tags: trunk | |
| 04:40 | Corrected inverted logic for static linking check-in: 69081b236e user: rkeene tags: trunk | |
| 04:40 | Updated to support building Tk statically Updated to build Tk statically on Windowscheck-in: ee99c0e5ae user: rkeene tags: trunk | |
Changes
Modified tk/build.sh from [f20054e4a2] to [25355eced1].
| ︙ | ︙ | |||
| 56 57 58 59 60 61 62 | 
	cd "${BUILDDIR}" || exit 1
	for dir in unix win macosx; do
		# Remove previous directory's "tkConfig.sh" if found
		rm -f 'tkConfig.sh'
		cd "${BUILDDIR}/${dir}" || exit 1
 | | > > | 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 | 
	cd "${BUILDDIR}" || exit 1
	for dir in unix win macosx; do
		# Remove previous directory's "tkConfig.sh" if found
		rm -f 'tkConfig.sh'
		cd "${BUILDDIR}/${dir}" || exit 1
		if [ "${dir}" = "win" ]; then
			# Statically link Tk to Tclkit if we are compiling for
			# Windows
			STATICTK="1"
		fi
		if [ "${STATICTK}" = "1" ]; then
			echo "Running: ./configure --disable-shared --disable-symbols --prefix=\"${INSTDIR}\" --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"
			./configure --disable-shared --disable-symbols --prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
		else
			echo "Running: ./configure --enable-shared --disable-symbols --prefix=\"${INSTDIR}\" --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"
			./configure --enable-shared --disable-symbols --prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
		fi
		${MAKE:-make} || continue
		${MAKE:-make} install
 | 
| ︙ | ︙ |