Overview
| Comment: | Updated to remove duplicate library references when linking in Tk | 
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive | 
| Timelines: | family | ancestors | descendants | both | trunk | 
| Files: | files | file ages | folders | 
| SHA1: | 
82f72a0dcdf8efd086681f33a2ae6918 | 
| User & Date: | rkeene on 2010-09-26 04:46:20 | 
| Other Links: | manifest | tags | 
Context
| 
   2010-09-26 
 | ||
| 04:46 | Updated to support cross-compiling Tcl 8.5.9 check-in: cdb34a8a59 user: rkeene tags: trunk | |
| 04:46 | Updated to remove duplicate library references when linking in Tk check-in: 82f72a0dcd user: rkeene tags: trunk | |
| 04:46 | 
Added script to publish test results
 Added new "parray" test check-in: 2a8304f779 user: rkeene tags: trunk | |
Changes
Modified kitsh/buildsrc/kitsh-0.0/aclocal.m4 from [e5b75fa21b] to [04ee15ac39].
| ︙ | ︙ | |||
81 82 83 84 85 86 87 88 89 90 91 92 93 94  | 
	if test -f "${tkconfigsh}"; then
		. "${tkconfigsh}"
		CFLAGS="${CFLAGS} ${TK_INCLUDE_SPEC} -I${tkconfigshdir} -I${TK_SRC_DIR}/generic -I${TK_SRC_DIR}/xlib"
		CPPFLAGS="${CPPFLAGS} ${TK_INCLUDE_SPEC} -I${tkconfigshdir} -I${TK_SRC_DIR}/generic -I${TK_SRC_DIR}/xlib"
		LIBS="${LIBS} ${TK_LIBS}"
	fi
	AC_SUBST(CFLAGS)
	AC_SUBST(CPPFLAGS)
	AC_SUBST(LIBS)
	AC_MSG_RESULT([$tkconfigsh])
 | > > > > > > > > > > >  | 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105  | 
	if test -f "${tkconfigsh}"; then
		. "${tkconfigsh}"
		CFLAGS="${CFLAGS} ${TK_INCLUDE_SPEC} -I${tkconfigshdir} -I${TK_SRC_DIR}/generic -I${TK_SRC_DIR}/xlib"
		CPPFLAGS="${CPPFLAGS} ${TK_INCLUDE_SPEC} -I${tkconfigshdir} -I${TK_SRC_DIR}/generic -I${TK_SRC_DIR}/xlib"
		LIBS="${LIBS} ${TK_LIBS}"
		NEWLIBS=""
		for lib in ${LIBS}; do
			if echo "${lib}" | grep '^-l' >/dev/null; then
				if echo " ${NEWLIBS} " | grep " ${lib} " >/dev/null; then
					continue
				fi
			fi
			NEWLIBS="${NEWLIBS} ${lib}"
		done
		LIBS="${NEWLIBS}"
	fi
	AC_SUBST(CFLAGS)
	AC_SUBST(CPPFLAGS)
	AC_SUBST(LIBS)
	AC_MSG_RESULT([$tkconfigsh])
 | 
| ︙ | ︙ |