Check-in [bdb920afdb]
Overview
Comment:Corrected issue introduced in [d56c4a3049f6555b] where projects where always attempted to be linked against if they were attempted to be compiled (but failed)
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:bdb920afdbfe5455cd320ad33b3f2e054f40a89c
User & Date: rkeene on 2014-05-19 04:18:59
Other Links: manifest | tags
Context
2014-05-19
04:19
Removed extraneous debugging information in last commit check-in: c401b28269 user: rkeene tags: trunk
04:18
Corrected issue introduced in [d56c4a3049f6555b] where projects where always attempted to be linked against if they were attempted to be compiled (but failed) check-in: bdb920afdb user: rkeene tags: trunk
03:53
Corrected path check-in: a292122a04 user: rkeene tags: trunk
Changes

Modified kitsh/buildsrc/kitsh-0.0/aclocal.m4 from [a86a7a549c] to [bfe7cbbaec].

   197    197   			projexclude="`cat "$projexcludefile"`"
   198    198   			projlibfiles="`echo "$projlibfiles" | egrep -v "$projexclude"`"
   199    199   		fi
   200    200   
   201    201   		projlibfilesnostub="`echo "$projlibfiles" | grep -v 'stub' | tr "\n" ' '`"
   202    202   		projlibfiles="`echo "$projlibfiles" | tr "\n" ' '`"
   203    203   		projlibextra=""
          204  +
          205  +		if test "$projlibfilesnostub" = ' '; then
          206  +			projlibfilesnostub=''
          207  +		fi
   204    208   
   205    209   		for libfile in ${projlibfilesnostub}; do
   206    210   			if test -f "${libfile}.linkadd"; then
   207    211   				projlibextra="`cat "${libfile}.linkadd"`"
   208    212   			fi
   209    213   		done
   210    214   
................................................................................
   273    277   		fi
   274    278   
   275    279   		dnl Do not explicitly link to Zlib, that will happen elsewhere
   276    280   		if test "${proj}" = "zlib"; then
   277    281   			continue
   278    282   		fi
   279    283   
          284  +echo "***: proj=$proj; subprojs=$subprojs; projlibfilesnostub=\"$projlibfilesnostub\""
   280    285   		if test -n "${subprojs}"; then
   281    286   			if test -n "${projlibfilesnostub}"; then
   282    287   				for subproj in $subprojs; do
   283    288   					subprojucase="`echo ${subproj} | dd conv=ucase 2>/dev/null`"
   284    289   					subprojtcase="`echo ${subprojucase} | cut -c 1``echo ${subproj} | cut -c 2-`"
   285    290   					lib_init_func="${subprojtcase}_Init"
   286    291