Modified kitsh/buildsrc/kitsh-0.0/aclocal.m4 from [b344f06840] to [ca463da686].

   210    210   			projlibfilesnostub=''
   211    211   		fi
   212    212   
   213    213   		if test "$projlibfiles" = ' '; then
   214    214   			projlibfiles=''
   215    215   		fi
   216    216   
          217  +		projlibextra_static=''
   217    218   		for libfile in ${projlibfilesnostub}; do
   218    219   			if test -f "${libfile}.linkadd"; then
   219    220   				projlibextra="`cat "${libfile}.linkadd"`"
          221  +
          222  +				dnl Replace static linking requests with the appropriate values
          223  +				if echo "${projlibextra}" | grep '^#STATIC ' >/dev/null; then
          224  +					projlibextra_static="${projlibextra_static} `echo "${projlibextra}" | sed 's@^#STATIC @@'`"
          225  +					projlibextra=''
          226  +				fi
   220    227   			fi
   221    228   		done
   222    229   
   223    230   		AC_MSG_RESULT([${projlibfilesnostub} ${projlibextra}])
          231  +
          232  +		if [ -n "${projlibextra_static}" ]; then
          233  +			DC_DO_STATIC_LINK_LIB([Additional libraries for ${proj}], ${projlibextra_static})
          234  +		fi
   224    235   
   225    236   		hide_symbols="1"
   226    237   
   227    238   		if test "${proj}" = "tcl"; then
   228    239   			DC_TEST_WHOLE_ARCHIVE_SHARED_LIB([$ARCHS $projlibfilesnostub], [
   229    240   				projlibfiles="${projlibfilesnostub}"
   230    241   			], [

Modified tls/build.sh from [1f2a192f9a] to [e69d6c7eca].

   130    130   			addlibs="-L${SSL_LIB_DIR:-/lib} -lssl -lcrypto"
   131    131   			addlibs_staticOnly=""
   132    132   		fi
   133    133   
   134    134   		addlibs="${addlibs} ${KC_TLS_LINKADD}"
   135    135   
   136    136   		if [ "${KC_TLS_LINKSSLSTATIC}" = '1' ]; then
   137         -			echo "-Wl,-Bstatic ${addlibs} ${addlibs_staticOnly} -Wl,-Bdynamic"
          137  +			echo "#STATIC ${addlibs} ${addlibs_staticOnly}"
   138    138   		else
   139    139   			echo "${addlibs}"
   140    140   		fi > "${linkaddfile}"
   141    141   	fi
   142    142   }