Differences From Artifact [1f1678240f]:
- File
kitsh/buildsrc/kitsh-0.0/aclocal.m4
— part of check-in
[75fa17d1eb]
at
2011-05-23 15:33:54
on branch merge-kitdll-kitsh-common
— Corrected typo
Updated to weak zlib symbols
Updated to not link against stub archives for Tk as well as Tcl (user: rkeene, size: 11674) [annotate] [blame] [check-ins using] [more...]
 
To Artifact [d398d3b4ba]:
- File kitsh/buildsrc/kitsh-0.0/aclocal.m4 — part of check-in [349896fca7] at 2011-05-31 02:03:03 on branch pluggable — Updated to be pluggable (user: rkeene, size: 12975) [annotate] [blame] [check-ins using] [more...]
 
| ︙ | ︙ | |||
156 157 158 159 160 161 162  | AC_DEFUN(DC_FIND_TCLKIT_LIBS, [ DC_SETUP_TCL_PLAT_DEFS dnl We will need this for the Tcl project, which we will always have DC_CHECK_FOR_WHOLE_ARCHIVE  | > > | > > | > > > > > > > > > > > > > > > > > > > >  | 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224  | 
AC_DEFUN(DC_FIND_TCLKIT_LIBS, [
	DC_SETUP_TCL_PLAT_DEFS
	dnl We will need this for the Tcl project, which we will always have
	DC_CHECK_FOR_WHOLE_ARCHIVE
	echo '/* Dynamically generated. */' > kitInit-libs.h
	libs_init_funcs=""
	for projdir in ../../../*/; do
		proj="`basename "${projdir}"`"
		if test "${proj}" = "build"; then
			continue
		fi
		if test "${proj}" = "kitsh"; then
			continue
		fi
		projlibdir="../../../${proj}/inst"
		if test -d "${projlibdir}"; then
			true
		else
			continue
		fi
		AC_MSG_CHECKING([for libraries required for ${proj}])
		projlibfiles="`find "${projlibdir}" -name '*.a' 2>/dev/null | tr "\n" ' '`"
		projlibfilesnostub="`find "${projlibdir}" -name '*.a' 2>/dev/null | grep -v 'stub' | tr "\n" ' '`"
		AC_MSG_RESULT([${projlibfilesnostub}])
		hide_symbols="1"
		initialize="1"
		if test "${proj}" = "tcl"; then
			DC_TEST_WHOLE_ARCHIVE_SHARED_LIB([$ARCHS $projlibfilesnostub], [
				projlibfiles="${projlibfilesnostub}"
			], [
				DC_TEST_WHOLE_ARCHIVE_SHARED_LIB([$ARCHS $projlibfiles], [
					projlibfiles="${projlibfiles}"
				])
			])
			hide_symbols="0"
			initialize="0"
		fi
		if test "${proj}" = "mk4tcl"; then
			if test -n "${projlibfiles}"; then
				AC_DEFINE(KIT_INCLUDES_MK4TCL, [1], [Specify this if you link against mkt4tcl])
				kc_cv_feature_kit_includes_mk4tcl='1'
				DC_DO_STATIC_LINK_LIBCXX
			fi
			initialize="0"
		fi
		if test "${proj}" = "tk"; then
			if test "${projlibfilesnostub}" != ""; then
				DC_DO_TK
				AC_DEFINE(KIT_INCLUDES_TK, [1], [Specify this if we link statically to Tk])
				if test -n "${TK_VERSION}"; then
 | 
| ︙ | ︙ | |||
212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239  | 
					DC_TEST_WHOLE_ARCHIVE_SHARED_LIB([$ARCHS $projlibfiles], [
						projlibfiles="${projlibfiles}"
					])
				])
				hide_symbols="0"
			fi
		fi
		if test "${hide_symbols}" = "1"; then
			STRIPLIBS="${STRIPLIBS} ${projlibfiles}"
		fi
		dnl Do not explicitly link to Zlib, that will happen elsewhere
		if test "${proj}" = "zlib"; then
			continue
		fi
		ARCHS="${ARCHS} ${projlibfiles}"
	done
	AC_SUBST(ARCHS)
	AC_SUBST(STRIPLIBS)
])
AC_DEFUN(DC_SETUP_TCL_PLAT_DEFS, [
	AC_CANONICAL_BUILD
	AC_CANONICAL_HOST
 | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > >  | 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295  | 
					DC_TEST_WHOLE_ARCHIVE_SHARED_LIB([$ARCHS $projlibfiles], [
						projlibfiles="${projlibfiles}"
					])
				])
				hide_symbols="0"
			fi
			initialize="0"
		fi
		if test "${proj}" = "thread"; then
			initialize="0"
		fi
		if test "${proj}" = "tclvfs"; then
			initialize="0"
		fi
		if test "${hide_symbols}" = "1"; then
			STRIPLIBS="${STRIPLIBS} ${projlibfiles}"
		fi
		dnl Do not explicitly link to Zlib, that will happen elsewhere
		if test "${proj}" = "zlib"; then
			continue
		fi
		if test "${initialize}" = "1"; then
			if test -n "${projlibfilesnostub}"; then
				projucase="`echo ${proj} | dd conv=ucase 2>/dev/null`"
				projtcase="`echo ${projucase} | cut -c 1``echo ${proj} | cut -c 2-`"
				lib_init_func="${projtcase}_Init"
				echo "#define KIT_INCLUDES_${projucase}" >> kitInit-libs.h
				echo "Tcl_AppInitProc ${lib_init_func};" >> kitInit-libs.h
				libs_init_funcs="${libs_init_funcs} ${lib_init_func}"
			fi
		fi
		ARCHS="${ARCHS} ${projlibfiles}"
	done
	echo '' >> kitInit-libs.h
	echo 'static void _Tclkit_GenericLib_Init(void) {' >> kitInit-libs.h
	for lib_init_func in ${libs_init_funcs}; do
		proj="`echo ${lib_init_func} | sed 's@_Init$$@@@' | dd conv=lcase 2>/dev/null`"
		echo "	Tcl_StaticPackage(0, \"${proj}\", ${lib_init_func}, NULL);" >> kitInit-libs.h
	done
	echo '	return;' >> kitInit-libs.h
	echo '}' >> kitInit-libs.h
	AC_SUBST(ARCHS)
	AC_SUBST(STRIPLIBS)
])
AC_DEFUN(DC_SETUP_TCL_PLAT_DEFS, [
	AC_CANONICAL_BUILD
	AC_CANONICAL_HOST
 | 
| ︙ | ︙ |