Skip to content

Commit e491cca

Browse files
author
jan.nijtmans
committed
Update TEA files to the latest version
1 parent c1a8d11 commit e491cca

File tree

2 files changed

+102
-98
lines changed

2 files changed

+102
-98
lines changed

configure

Lines changed: 78 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -2768,10 +2768,16 @@ printf "%s\n" "$as_me: WARNING: --with-tcl argument should refer to directory co
27682768
`ls -d /usr/pkg/lib 2>/dev/null` \
27692769
`ls -d /usr/lib 2>/dev/null` \
27702770
`ls -d /usr/lib64 2>/dev/null` \
2771+
`ls -d /usr/lib/tcl9.0 2>/dev/null` \
2772+
`ls -d /usr/lib/tcl8.7 2>/dev/null` \
27712773
`ls -d /usr/lib/tcl8.6 2>/dev/null` \
27722774
`ls -d /usr/lib/tcl8.5 2>/dev/null` \
2775+
`ls -d /usr/local/lib/tcl9.0 2>/dev/null` \
2776+
`ls -d /usr/local/lib/tcl8.7 2>/dev/null` \
27732777
`ls -d /usr/local/lib/tcl8.6 2>/dev/null` \
27742778
`ls -d /usr/local/lib/tcl8.5 2>/dev/null` \
2779+
`ls -d /usr/local/lib/tcl/tcl9.0 2>/dev/null` \
2780+
`ls -d /usr/local/lib/tcl/tcl8.7 2>/dev/null` \
27752781
`ls -d /usr/local/lib/tcl/tcl8.6 2>/dev/null` \
27762782
`ls -d /usr/local/lib/tcl/tcl8.5 2>/dev/null` \
27772783
; do
@@ -3847,11 +3853,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
38473853
printf %s "checking for existence of ${TCL_BIN_DIR}/tclConfig.sh... " >&6; }
38483854

38493855
if test -f "${TCL_BIN_DIR}/tclConfig.sh" ; then
3850-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: loading" >&5
3856+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: loading" >&5
38513857
printf "%s\n" "loading" >&6; }
38523858
. "${TCL_BIN_DIR}/tclConfig.sh"
38533859
else
3854-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: could not find ${TCL_BIN_DIR}/tclConfig.sh" >&5
3860+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: could not find ${TCL_BIN_DIR}/tclConfig.sh" >&5
38553861
printf "%s\n" "could not find ${TCL_BIN_DIR}/tclConfig.sh" >&6; }
38563862
fi
38573863

@@ -3862,9 +3868,9 @@ printf "%s\n" "could not find ${TCL_BIN_DIR}/tclConfig.sh" >&6; }
38623868
# instead of TCL_BUILD_LIB_SPEC since it will work with both an
38633869
# installed and uninstalled version of Tcl.
38643870
if test -f "${TCL_BIN_DIR}/Makefile" ; then
3865-
TCL_LIB_SPEC="${TCL_BUILD_LIB_SPEC}"
3866-
TCL_STUB_LIB_SPEC="${TCL_BUILD_STUB_LIB_SPEC}"
3867-
TCL_STUB_LIB_PATH="${TCL_BUILD_STUB_LIB_PATH}"
3871+
TCL_LIB_SPEC="${TCL_BUILD_LIB_SPEC}"
3872+
TCL_STUB_LIB_SPEC="${TCL_BUILD_STUB_LIB_SPEC}"
3873+
TCL_STUB_LIB_PATH="${TCL_BUILD_STUB_LIB_PATH}"
38683874
elif test "`uname -s`" = "Darwin"; then
38693875
# If Tcl was built as a framework, attempt to use the libraries
38703876
# from the framework at the given location so that linking works
@@ -6073,19 +6079,19 @@ fi
60736079
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: shared" >&5
60746080
printf "%s\n" "shared" >&6; }
60756081
SHARED_BUILD=1
6076-
STUBS_BUILD=1
6082+
STUBS_BUILD=1
60776083
else
60786084
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: static" >&5
60796085
printf "%s\n" "static" >&6; }
60806086
SHARED_BUILD=0
60816087

60826088
printf "%s\n" "#define STATIC_BUILD 1" >>confdefs.h
60836089

6084-
if test "$stubs_ok" = "yes" ; then
6085-
STUBS_BUILD=1
6086-
else
6087-
STUBS_BUILD=0
6088-
fi
6090+
if test "$stubs_ok" = "yes" ; then
6091+
STUBS_BUILD=1
6092+
else
6093+
STUBS_BUILD=0
6094+
fi
60896095
fi
60906096
if test "${STUBS_BUILD}" = "1" ; then
60916097

@@ -6524,14 +6530,14 @@ fi
65246530
fi
65256531

65266532
if test "$GCC" != "yes" ; then
6527-
if test "${SHARED_BUILD}" = "0" ; then
6533+
if test "${SHARED_BUILD}" = "0" ; then
65286534
runtime=-MT
6529-
else
6535+
else
65306536
runtime=-MD
6531-
fi
6532-
case "x`echo \${VisualStudioVersion}`" in
6533-
x1[4-9]*)
6534-
lflags="${lflags} -nodefaultlib:libucrt.lib"
6537+
fi
6538+
case "x`echo \${VisualStudioVersion}`" in
6539+
x1[4-9]*)
6540+
lflags="${lflags} -nodefaultlib:libucrt.lib"
65356541

65366542
vars="ucrt.lib"
65376543
for i in $vars; do
@@ -6543,12 +6549,12 @@ fi
65436549
done
65446550

65456551

6546-
;;
6547-
*)
6548-
;;
6549-
esac
6552+
;;
6553+
*)
6554+
;;
6555+
esac
65506556

6551-
if test "$do64bit" != "no" ; then
6557+
if test "$do64bit" != "no" ; then
65526558
CC="cl.exe"
65536559
RC="rc.exe"
65546560
lflags="${lflags} -nologo -MACHINE:${MACHINE} "
@@ -7265,19 +7271,19 @@ fi
72657271
if test "$do64bit" = yes
72667272
then :
72677273

7268-
if test "$GCC" = yes
7274+
if test "$GCC" = yes
72697275
then :
72707276

7271-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: 64bit mode not supported by gcc" >&5
7277+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: 64bit mode not supported by gcc" >&5
72727278
printf "%s\n" "$as_me: WARNING: 64bit mode not supported by gcc" >&2;}
72737279

72747280
else case e in #(
72757281
e)
7276-
do64bit_ok=yes
7277-
SHLIB_LD="ld -64 -shared -rdata_shared"
7278-
CFLAGS="$CFLAGS -64"
7279-
LDFLAGS_ARCH="-64"
7280-
;;
7282+
do64bit_ok=yes
7283+
SHLIB_LD="ld -64 -shared -rdata_shared"
7284+
CFLAGS="$CFLAGS -64"
7285+
LDFLAGS_ARCH="-64"
7286+
;;
72817287
esac
72827288
fi
72837289

@@ -7305,7 +7311,7 @@ then :
73057311
LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
73067312
fi
73077313
;;
7308-
esac
7314+
esac
73097315

73107316
if test $doRpath = yes
73117317
then :
@@ -7769,11 +7775,11 @@ printf "%s\n" "#define _OE_SOCKETS 1" >>confdefs.h
77697775
if test "$SHARED_BUILD" = 1
77707776
then :
77717777

7772-
SHLIB_LD='ld -shared -expect_unresolved "*"'
7778+
SHLIB_LD='ld -shared -expect_unresolved "*"'
77737779

77747780
else case e in #(
77757781
e)
7776-
SHLIB_LD='ld -non_shared -expect_unresolved "*"'
7782+
SHLIB_LD='ld -non_shared -expect_unresolved "*"'
77777783
;;
77787784
esac
77797785
fi
@@ -8062,7 +8068,7 @@ esac
80628068
fi
80638069
rm -f core conftest.err conftest.$ac_objext conftest.beam \
80648070
conftest$ac_exeext conftest.$ac_ext
8065-
LDFLAGS=$hold_ldflags ;;
8071+
LDFLAGS=$hold_ldflags ;;
80668072
esac
80678073
fi
80688074
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_ld_Bexport" >&5
@@ -8505,15 +8511,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
85058511
# See if we could use long anyway Note that we substitute in the
85068512
# type that is our current guess for a 64-bit type inside this check
85078513
# program, so it should be modified only carefully...
8508-
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8514+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
85098515
/* end confdefs.h. */
85108516
85118517
int
85128518
main (void)
85138519
{
85148520
switch (0) {
8515-
case 1: case (sizeof(${tcl_type_64bit})==sizeof(long)): ;
8516-
}
8521+
case 1: case (sizeof(${tcl_type_64bit})==sizeof(long)): ;
8522+
}
85178523
;
85188524
return 0;
85198525
}
@@ -8671,7 +8677,7 @@ int
86718677
main (void)
86728678
{
86738679
struct dirent64 *p; DIR64 d = opendir64(".");
8674-
p = readdir64(d); rewinddir64(d); closedir64(d);
8680+
p = readdir64(d); rewinddir64(d); closedir64(d);
86758681
;
86768682
return 0;
86778683
}
@@ -8775,8 +8781,8 @@ esac
87758781
fi
87768782

87778783
if test "x${tcl_cv_type_off64_t}" = "xyes" && \
8778-
test "x${ac_cv_func_lseek64}" = "xyes" && \
8779-
test "x${ac_cv_func_open64}" = "xyes" ; then
8784+
test "x${ac_cv_func_lseek64}" = "xyes" && \
8785+
test "x${ac_cv_func_open64}" = "xyes" ; then
87808786

87818787
printf "%s\n" "#define HAVE_TYPE_OFF64_T 1" >>confdefs.h
87828788

@@ -9032,7 +9038,7 @@ rm -rf conftest*
90329038

90339039
PACKAGE_LIB_PREFIX8="${PACKAGE_LIB_PREFIX}"
90349040
PACKAGE_LIB_PREFIX9="${PACKAGE_LIB_PREFIX}tcl9"
9035-
if test "${TCL_MAJOR_VERSION}" -gt 8 -a x"${with_tcl8}" == x; then
9041+
if test "${TCL_MAJOR_VERSION}" -gt 8 -a x"${with_tcl8}" = x; then
90369042
PACKAGE_LIB_PREFIX="${PACKAGE_LIB_PREFIX9}"
90379043
else
90389044
PACKAGE_LIB_PREFIX="${PACKAGE_LIB_PREFIX8}"
@@ -9063,7 +9069,7 @@ printf "%s\n" "#define TCL_MAJOR_VERSION 8" >>confdefs.h
90639069
eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
90649070
fi
90659071
# Some packages build their own stubs libraries
9066-
if test "${TCL_MAJOR_VERSION}" -gt 8 -a x"${with_tcl8}" == x; then
9072+
if test "${TCL_MAJOR_VERSION}" -gt 8 -a x"${with_tcl8}" = x; then
90679073
eval eval "PKG_STUB_LIB_FILE=${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}stub.a"
90689074
else
90699075
eval eval "PKG_STUB_LIB_FILE=${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}stub${UNSHARED_LIB_SUFFIX}"
@@ -9091,7 +9097,7 @@ printf "%s\n" "#define TCL_MAJOR_VERSION 8" >>confdefs.h
90919097
eval eval "PKG_LIB_FILE=lib${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
90929098
fi
90939099
# Some packages build their own stubs libraries
9094-
if test "${TCL_MAJOR_VERSION}" -gt 8 -a x"${with_tcl8}" == x; then
9100+
if test "${TCL_MAJOR_VERSION}" -gt 8 -a x"${with_tcl8}" = x; then
90959101
eval eval "PKG_STUB_LIB_FILE=lib${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}stub.a"
90969102
else
90979103
eval eval "PKG_STUB_LIB_FILE=lib${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}stub${UNSHARED_LIB_SUFFIX}"
@@ -9128,37 +9134,37 @@ printf "%s\n" "#define TCL_MAJOR_VERSION 8" >>confdefs.h
91289134
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tclsh" >&5
91299135
printf %s "checking for tclsh... " >&6; }
91309136
if test -f "${TCL_BIN_DIR}/Makefile" ; then
9131-
# tclConfig.sh is in Tcl build directory
9132-
if test "${TEA_PLATFORM}" = "windows"; then
9133-
if test -f "${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${EXEEXT}" ; then
9134-
TCLSH_PROG="${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${EXEEXT}"
9135-
elif test -f "${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}s${EXEEXT}" ; then
9136-
TCLSH_PROG="${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}s${EXEEXT}"
9137-
elif test -f "${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}t${EXEEXT}" ; then
9138-
TCLSH_PROG="${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}t${EXEEXT}"
9139-
elif test -f "${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}st${EXEEXT}" ; then
9140-
TCLSH_PROG="${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}st${EXEEXT}"
9141-
fi
9142-
else
9143-
TCLSH_PROG="${TCL_BIN_DIR}/tclsh"
9144-
fi
9137+
# tclConfig.sh is in Tcl build directory
9138+
if test "${TEA_PLATFORM}" = "windows"; then
9139+
if test -f "${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${EXEEXT}" ; then
9140+
TCLSH_PROG="${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${EXEEXT}"
9141+
elif test -f "${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}s${EXEEXT}" ; then
9142+
TCLSH_PROG="${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}s${EXEEXT}"
9143+
elif test -f "${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}t${EXEEXT}" ; then
9144+
TCLSH_PROG="${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}t${EXEEXT}"
9145+
elif test -f "${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}st${EXEEXT}" ; then
9146+
TCLSH_PROG="${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}st${EXEEXT}"
9147+
fi
9148+
else
9149+
TCLSH_PROG="${TCL_BIN_DIR}/tclsh"
9150+
fi
91459151
else
9146-
# tclConfig.sh is in install location
9147-
if test "${TEA_PLATFORM}" = "windows"; then
9148-
TCLSH_PROG="tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${EXEEXT}"
9149-
else
9150-
TCLSH_PROG="tclsh${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}"
9151-
fi
9152-
list="`ls -d ${TCL_BIN_DIR}/../bin 2>/dev/null` \
9153-
`ls -d ${TCL_BIN_DIR}/.. 2>/dev/null` \
9154-
`ls -d ${TCL_PREFIX}/bin 2>/dev/null`"
9155-
for i in $list ; do
9156-
if test -f "$i/${TCLSH_PROG}" ; then
9157-
REAL_TCL_BIN_DIR="`cd "$i"; pwd`/"
9158-
break
9159-
fi
9160-
done
9161-
TCLSH_PROG="${REAL_TCL_BIN_DIR}${TCLSH_PROG}"
9152+
# tclConfig.sh is in install location
9153+
if test "${TEA_PLATFORM}" = "windows"; then
9154+
TCLSH_PROG="tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${EXEEXT}"
9155+
else
9156+
TCLSH_PROG="tclsh${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}"
9157+
fi
9158+
list="`ls -d ${TCL_BIN_DIR}/../bin 2>/dev/null` \
9159+
`ls -d ${TCL_BIN_DIR}/.. 2>/dev/null` \
9160+
`ls -d ${TCL_PREFIX}/bin 2>/dev/null`"
9161+
for i in $list ; do
9162+
if test -f "$i/${TCLSH_PROG}" ; then
9163+
REAL_TCL_BIN_DIR="`cd "$i"; pwd`/"
9164+
break
9165+
fi
9166+
done
9167+
TCLSH_PROG="${REAL_TCL_BIN_DIR}${TCLSH_PROG}"
91629168
fi
91639169
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${TCLSH_PROG}" >&5
91649170
printf "%s\n" "${TCLSH_PROG}" >&6; }

0 commit comments

Comments
 (0)