Diff

Differences From Artifact [a1e30e5a0a]:

To Artifact [fd163a032f]:


     7      7   fi
     8      8   if [ -z "${TCLVERS}" ]; then
     9      9   	echo 'ERROR: The TCLVERS environment variable is not set' >&2
    10     10   
    11     11   	exit 1
    12     12   fi
    13     13   
    14         -ITCLVERS="3.4.2"
           14  +ITCLVERS="3.4.3"
    15     15   ITCLVERSEXTRA=""
    16     16   SRC="src/itcl-${ITCLVERS}.tar.gz"
    17         -SRCURL="http://sourceforge.net/projects/incrtcl/files/%5BIncr%20Tcl_Tk%5D-source/${ITCLVERS}/itcl${ITCLVERS}${ITCLVERSEXTRA}.tar.gz/download"
    18         -SRCHASH='-'
           17  +SRCURL="http://sourceforge.net/projects/incrtcl/files/%5BIncr%20Tcl_Tk%5D-source/Itcl%20${ITCLVERS}/itcl${ITCLVERS}${ITCLVERSEXTRA}.tar.gz/download"
           18  +SRCHASH='28b55f44a2fd450862a6f12982c00c1d03d767f62a834d83945a616e06068887'
    19     19   BUILDDIR="$(pwd)/build/itcl${ITCLVERS}"
    20     20   OUTDIR="$(pwd)/out"
    21     21   INSTDIR="$(pwd)/inst"
    22     22   export ITCLVERS SRC SRCURL BUILDDIR OUTDIR INSTDIR
    23     23   
    24     24   # Set configure options for this sub-project
    25     25   LDFLAGS="${LDFLAGS} ${KC_ITCL_LDFLAGS}"
................................................................................
    29     29   export LDFLAGS CFLAGS CPPFLAGS LIBS
    30     30   
    31     31   rm -rf 'build' 'out' 'inst'
    32     32   mkdir 'build' 'out' 'inst' || exit 1
    33     33   
    34     34   # Determine if Itcl is even needed
    35     35   (
           36  +	# Always build if we are being forced to build
           37  +	if [ "${KITCREATOR_ITCL3_FORCE}" = '1' ]; then
           38  +		exit 0
           39  +	fi
           40  +
    36     41   	TCL_VERSION="unknown"
    37     42   	if [ -f "${TCLCONFIGDIR}/tclConfig.sh" ]; then
    38     43   		source "${TCLCONFIGDIR}/tclConfig.sh"
    39     44   	fi
    40     45   
    41     46   	if echo "${TCL_VERSION}" | grep '^8\.[45]$' >/dev/null; then
    42     47   		# Itcl is required for Tcl 8.4 and Tcl 8.5