Diff

Differences From Artifact [00b0b4f987]:

To Artifact [d6e02d73c4]:


   145    145   function preconfigure() {
   146    146   	:
   147    147   }
   148    148   
   149    149   function configure() {
   150    150   	local tryopts tryopt
   151    151   	local staticpkg staticpkgvar
   152         -	local isshared
          152  +	local isshared disable_stubs
   153    153   	local save_cflags
   154    154   	local base_var kc_var
   155    155   	local configure_opt configure_opts configure_opts_new
   156    156   	local ignore_opt ignore_this_opt
   157    157   
   158    158   	# Determine if the user decided this should be static or not
   159    159   	staticpkgvar="$(echo "STATIC${internalpkgname}" | dd conv=ucase 2>/dev/null)"
................................................................................
   210    210   
   211    211   		if [ "${isshared}" = '0' ]; then
   212    212   			pkg_configure_shared_build='0'
   213    213   		else
   214    214   			pkg_configure_shared_build='1'
   215    215   		fi
   216    216   
          217  +		disable_stubs='0'
   217    218   		if [ "${isshared}" = '0' ]; then
   218         -			tryopt="${tryopt} --disable-stubs --enable-static"
          219  +			tryopt="${tryopt} --enable-static"
          220  +			disable_stubs='1'
   219    221   		fi
   220    222   
   221    223   		if ! grep '[-]-disable-stubs' configure >/dev/null 2>/dev/null; then
   222         -			if [ "${isshared}" = '0' ]; then
          224  +			if [ "${disable_stubs}" = '1' ]; then
   223    225   				sed 's@USE_TCL_STUBS@XXX_TCL_STUBS@g' configure > configure.new
   224    226   			else
   225    227   				sed 's@XXX_TCL_STUBS@USE_TCL_STUBS@g' configure > configure.new
   226    228   			fi
   227    229   
   228    230   			cat configure.new > configure
   229    231   			rm -f configure.new
          232  +		else
          233  +			if [ "${disable_stubs}" = '1' ]; then
          234  +				tryopt="${tryopt} --disable-stubs"
          235  +			fi
   230    236   		fi
   231    237   
   232    238   		configure_opts=($tryopt --prefix="${installdir}" --exec-prefix="${installdir}" --libdir="${installdir}/lib" --with-tcl="${TCLCONFIGDIR}" "${configure_extra[@]}" ${CONFIGUREEXTRA})
   233    239   		configure_opts_new=()
   234    240   		for configure_opt in "${configure_opts[@]}"; do
   235    241   			ignore_this_opt='0'
   236    242   			for ignore_opt in "${pkg_ignore_opts[@]}"; do