Attachment "tea36.patch" to
ticket [1960628fff]
added by
stwo
2008-09-04 02:20:07.
diff -ur otea/sampleextension/pkgIndex.tcl.in ntea/sampleextension/pkgIndex.tcl.in
--- otea/sampleextension/pkgIndex.tcl.in Tue Nov 29 19:10:48 2005
+++ ntea/sampleextension/pkgIndex.tcl.in Wed Sep 3 14:23:15 2008
@@ -1,5 +1,5 @@
#
# Tcl package index file
#
-package ifneeded Tclsha1 @PACKAGE_VERSION@ \
+package ifneeded @PACKAGE_NAME@ @PACKAGE_VERSION@ \
[list load [file join $dir @PKG_LIB_FILE@] @PACKAGE_NAME@]
Only in ntea/sampleextension: pkgIndex.tcl.in~
diff -ur otea/sampleextension/tclconfig/tcl.m4 ntea/sampleextension/tclconfig/tcl.m4
--- otea/sampleextension/tclconfig/tcl.m4 Tue Aug 12 06:32:30 2008
+++ ntea/sampleextension/tclconfig/tcl.m4 Wed Sep 3 14:47:34 2008
@@ -358,7 +358,7 @@
elif test "`uname -s`" = "Darwin"; then
# If Tcl was built as a framework, attempt to use the libraries
# from the framework at the given location so that linking works
- # against Tcl.framework installed in an arbitary location.
+ # against Tcl.framework installed in an arbitrary location.
case ${TCL_DEFS} in
*TCL_FRAMEWORK*)
if test -f "${TCL_BIN_DIR}/${TCL_LIB_FILE}"; then
@@ -447,7 +447,7 @@
elif test "`uname -s`" = "Darwin"; then
# If Tk was built as a framework, attempt to use the libraries
# from the framework at the given location so that linking works
- # against Tk.framework installed in an arbitary location.
+ # against Tk.framework installed in an arbitrary location.
case ${TK_DEFS} in
*TK_FRAMEWORK*)
if test -f "${TK_BIN_DIR}/${TK_LIB_FILE}"; then
@@ -520,7 +520,7 @@
# none
#
# Results
-# Subst's the following values:
+# Substs the following values:
# TCLSH_PROG
#------------------------------------------------------------------------
@@ -570,7 +570,7 @@
# none
#
# Results
-# Subst's the following values:
+# Substs the following values:
# WISH_PROG
#------------------------------------------------------------------------
@@ -1115,7 +1115,7 @@
AS_IF([test "$GCC" = yes], [
# TEA specific:
CFLAGS_OPTIMIZE=-O2
- CFLAGS_WARNING="-Wall -Wno-implicit-int"
+ CFLAGS_WARNING="-Wall"
], [CFLAGS_WARNING=""])
TCL_NEEDS_EXP_FILE=0
TCL_BUILD_EXP_FILE=""
@@ -1125,6 +1125,7 @@
AC_CHECK_PROG(AR, ar, ar)
STLIB_LD='${AR} cr'
LD_LIBRARY_PATH_VAR="LD_LIBRARY_PATH"
+ AS_IF([test "x$SHLIB_VERSION" = x],[SHLIB_VERSION="1.0"])
case $system in
# TEA specific:
windows)
@@ -1684,7 +1685,7 @@
AS_IF([test $tcl_cv_ld_elf = yes], [
SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so'
], [
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
])
# Ancient FreeBSD doesn't handle version numbers with dots.
@@ -1702,7 +1703,7 @@
AS_IF([test $doRpath = yes], [
CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'])
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
AC_CACHE_CHECK([for ELF], tcl_cv_ld_elf, [
AC_EGREP_CPP(yes, [
#ifdef __ELF__
@@ -1983,7 +1984,7 @@
# requires an extra version number at the end of .so file names.
# So, the library has to have a name like libtcl75.so.1.0
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
TCL_LIB_VERSIONS_OK=nodots
;;
@@ -2334,7 +2335,7 @@
# Supply substitutes for missing POSIX header files. Special
# notes:
# - stdlib.h doesn't define strtol, strtoul, or
-# strtod insome versions of SunOS
+# strtod in some versions of SunOS
# - some versions of string.h don't declare procedures such
# as strstr
#
@@ -2701,7 +2702,7 @@
#
# Results:
#
-# Subst's the following var:
+# Substs the following var:
# TCL_LIBS
# MATH_LIBS
#
@@ -3617,6 +3618,7 @@
AC_MSG_ERROR([${with_tclinclude} directory does not contain tcl.h])
fi
else
+ list=""
if test "`uname -s`" = "Darwin"; then
# If Tcl was built as a framework, attempt to use
# the framework's Headers directory
@@ -3780,6 +3782,7 @@
AC_MSG_ERROR([${with_tkinclude} directory does not contain tk.h])
fi
else
+ list=""
if test "`uname -s`" = "Darwin"; then
# If Tk was built as a framework, attempt to use
# the framework's Headers directory.
@@ -3809,6 +3812,10 @@
`ls -d ${TCL_BIN_DIR}/../include 2>/dev/null`"
if test "${TEA_PLATFORM}" != "windows" -o "$GCC" = "yes"; then
list="$list /usr/local/include /usr/include"
+ if test x"${TK_INCLUDE_SPEC}" != x ; then
+ d=`echo "${TK_INCLUDE_SPEC}" | sed -e 's/^-I//'`
+ list="$list `ls -d ${d} 2>/dev/null`"
+ fi
fi
for i in $list ; do
if test -f "$i/tk.h" ; then
