Check-in [cb7271fcc4]
Overview
Comment:Updated to not switch back to dynamic linking if static linking has been requested
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:cb7271fcc45a07747fb54a2f3779c4f74b2716b6
User & Date: rkeene on 2011-07-07 17:21:30
Other Links: manifest | tags
Context
2011-07-16
13:59
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. check-in: 95d3afb4e9 user: sbron tags: trunk
2011-07-07
17:21
Updated to not switch back to dynamic linking if static linking has been requested check-in: cb7271fcc4 user: rkeene tags: trunk
2011-07-05
17:28
Updated additional build scripts to not attempt download if "buildsrc" directory is being used check-in: d860d314dd user: rkeene tags: trunk
Changes

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

   115    115   
   116    116   	SAVELIBS="${LIBS}"
   117    117   	staticlib=""
   118    118   	found="0"
   119    119   	dnl HP/UX uses -Wl,-a,archive -lstdc++ -Wl,-a,shared_archive
   120    120   	dnl Linux and Solaris us -Wl,-Bstatic ... -Wl,-Bdynamic
   121    121   	for trylink in "-Wl,-a,archive $2 -Wl,-a,shared_archive" "-Wl,-Bstatic $2 -Wl,-Bdynamic" "$2"; do
          122  +		if echo " ${LDFLAGS} " | grep ' -static ' >/dev/null; then
          123  +			if test "${trylink}" != "$2"; then
          124  +				continue
          125  +			fi
          126  +		fi
          127  +
   122    128   		LIBS="${SAVELIBS} ${trylink}"
   123    129   
   124    130   		AC_LINK_IFELSE(AC_LANG_PROGRAM([], []), [
   125    131   			staticlib="${trylink}"
   126    132   			found="1"
   127    133   
   128    134   			break