Check-in [cb7271fcc4]
Overview
SHA1:cb7271fcc45a07747fb54a2f3779c4f74b2716b6
Date: 2011-07-07 17:21:30
User: rkeene
Comment:Updated to not switch back to dynamic linking if static linking has been requested
Timelines: family | ancestors | descendants | both | trunk
Downloads: Tarball | ZIP archive
Other Links: files | file ages | folders | manifest
Tags And Properties
Context
2011-07-16
13:59
[95d3afb4e9] Fix seek operations with native zlib support. Without this fix creating images from gif files inside a starkit would frequently fail with an error message of: couldn't read GIF header from file XXX. (user: sbron, tags: trunk)
2011-07-07
17:21
[cb7271fcc4] Updated to not switch back to dynamic linking if static linking has been requested (user: rkeene, tags: trunk)
2011-07-05
17:28
[d860d314dd] Updated additional build scripts to not attempt download if "buildsrc" directory is being used (user: rkeene, tags: trunk)
Changes

Modified kitsh/buildsrc/kitsh-0.0/aclocal.m4 from [d398d3b4ba] to [ab8a5ebb9e].

115
116
117
118
119
120
121






122
123
124
125
126
127
128

	SAVELIBS="${LIBS}"
	staticlib=""
	found="0"
	dnl HP/UX uses -Wl,-a,archive -lstdc++ -Wl,-a,shared_archive
	dnl Linux and Solaris us -Wl,-Bstatic ... -Wl,-Bdynamic
	for trylink in "-Wl,-a,archive $2 -Wl,-a,shared_archive" "-Wl,-Bstatic $2 -Wl,-Bdynamic" "$2"; do






		LIBS="${SAVELIBS} ${trylink}"

		AC_LINK_IFELSE(AC_LANG_PROGRAM([], []), [
			staticlib="${trylink}"
			found="1"

			break







>
>
>
>
>
>







115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134

	SAVELIBS="${LIBS}"
	staticlib=""
	found="0"
	dnl HP/UX uses -Wl,-a,archive -lstdc++ -Wl,-a,shared_archive
	dnl Linux and Solaris us -Wl,-Bstatic ... -Wl,-Bdynamic
	for trylink in "-Wl,-a,archive $2 -Wl,-a,shared_archive" "-Wl,-Bstatic $2 -Wl,-Bdynamic" "$2"; do
		if echo " ${LDFLAGS} " | grep ' -static ' >/dev/null; then
			if test "${trylink}" != "$2"; then
				continue
			fi
		fi

		LIBS="${SAVELIBS} ${trylink}"

		AC_LINK_IFELSE(AC_LANG_PROGRAM([], []), [
			staticlib="${trylink}"
			found="1"

			break