@@ -2768,10 +2768,16 @@ printf "%s\n" "$as_me: WARNING: --with-tcl argument should refer to directory co
2768
2768
` ls -d /usr/pkg/lib 2> /dev/null` \
2769
2769
` ls -d /usr/lib 2> /dev/null` \
2770
2770
` 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` \
2771
2773
` ls -d /usr/lib/tcl8.6 2> /dev/null` \
2772
2774
` 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` \
2773
2777
` ls -d /usr/local/lib/tcl8.6 2> /dev/null` \
2774
2778
` 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` \
2775
2781
` ls -d /usr/local/lib/tcl/tcl8.6 2> /dev/null` \
2776
2782
` ls -d /usr/local/lib/tcl/tcl8.5 2> /dev/null` \
2777
2783
; do
@@ -3847,11 +3853,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
3847
3853
printf %s " checking for existence of ${TCL_BIN_DIR} /tclConfig.sh... " >&6 ; }
3848
3854
3849
3855
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
3851
3857
printf " %s\n" " loading" >&6 ; }
3852
3858
. " ${TCL_BIN_DIR} /tclConfig.sh"
3853
3859
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
3855
3861
printf " %s\n" " could not find ${TCL_BIN_DIR} /tclConfig.sh" >&6 ; }
3856
3862
fi
3857
3863
@@ -3862,9 +3868,9 @@ printf "%s\n" "could not find ${TCL_BIN_DIR}/tclConfig.sh" >&6; }
3862
3868
# instead of TCL_BUILD_LIB_SPEC since it will work with both an
3863
3869
# installed and uninstalled version of Tcl.
3864
3870
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} "
3868
3874
elif test " ` uname -s` " = " Darwin" ; then
3869
3875
# If Tcl was built as a framework, attempt to use the libraries
3870
3876
# from the framework at the given location so that linking works
@@ -6073,19 +6079,19 @@ fi
6073
6079
{ printf " %s\n" " $as_me :${as_lineno-$LINENO } : result: shared" >&5
6074
6080
printf " %s\n" " shared" >&6 ; }
6075
6081
SHARED_BUILD=1
6076
- STUBS_BUILD=1
6082
+ STUBS_BUILD=1
6077
6083
else
6078
6084
{ printf " %s\n" " $as_me :${as_lineno-$LINENO } : result: static" >&5
6079
6085
printf " %s\n" " static" >&6 ; }
6080
6086
SHARED_BUILD=0
6081
6087
6082
6088
printf " %s\n" " #define STATIC_BUILD 1" >> confdefs.h
6083
6089
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
6089
6095
fi
6090
6096
if test " ${STUBS_BUILD} " = " 1" ; then
6091
6097
@@ -6524,14 +6530,14 @@ fi
6524
6530
fi
6525
6531
6526
6532
if test " $GCC " ! = " yes" ; then
6527
- if test " ${SHARED_BUILD} " = " 0" ; then
6533
+ if test " ${SHARED_BUILD} " = " 0" ; then
6528
6534
runtime=-MT
6529
- else
6535
+ else
6530
6536
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"
6535
6541
6536
6542
vars=" ucrt.lib"
6537
6543
for i in $vars ; do
@@ -6543,12 +6549,12 @@ fi
6543
6549
done
6544
6550
6545
6551
6546
- ;;
6547
- * )
6548
- ;;
6549
- esac
6552
+ ;;
6553
+ * )
6554
+ ;;
6555
+ esac
6550
6556
6551
- if test " $do64bit " ! = " no" ; then
6557
+ if test " $do64bit " ! = " no" ; then
6552
6558
CC=" cl.exe"
6553
6559
RC=" rc.exe"
6554
6560
lflags=" ${lflags} -nologo -MACHINE:${MACHINE} "
@@ -7265,19 +7271,19 @@ fi
7265
7271
if test " $do64bit " = yes
7266
7272
then :
7267
7273
7268
- if test " $GCC " = yes
7274
+ if test " $GCC " = yes
7269
7275
then :
7270
7276
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
7272
7278
printf " %s\n" " $as_me : WARNING: 64bit mode not supported by gcc" >&2 ; }
7273
7279
7274
7280
else case e in # (
7275
7281
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
+ ;;
7281
7287
esac
7282
7288
fi
7283
7289
@@ -7305,7 +7311,7 @@ then :
7305
7311
LDFLAGS=" $LDFLAGS $PTHREAD_LIBS "
7306
7312
fi
7307
7313
;;
7308
- esac
7314
+ esac
7309
7315
7310
7316
if test $doRpath = yes
7311
7317
then :
@@ -7769,11 +7775,11 @@ printf "%s\n" "#define _OE_SOCKETS 1" >>confdefs.h
7769
7775
if test " $SHARED_BUILD " = 1
7770
7776
then :
7771
7777
7772
- SHLIB_LD=' ld -shared -expect_unresolved "*"'
7778
+ SHLIB_LD=' ld -shared -expect_unresolved "*"'
7773
7779
7774
7780
else case e in # (
7775
7781
e)
7776
- SHLIB_LD=' ld -non_shared -expect_unresolved "*"'
7782
+ SHLIB_LD=' ld -non_shared -expect_unresolved "*"'
7777
7783
;;
7778
7784
esac
7779
7785
fi
@@ -8062,7 +8068,7 @@ esac
8062
8068
fi
8063
8069
rm -f core conftest.err conftest.$ac_objext conftest.beam \
8064
8070
conftest$ac_exeext conftest.$ac_ext
8065
- LDFLAGS=$hold_ldflags ;;
8071
+ LDFLAGS=$hold_ldflags ;;
8066
8072
esac
8067
8073
fi
8068
8074
{ 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
8505
8511
# See if we could use long anyway Note that we substitute in the
8506
8512
# type that is our current guess for a 64-bit type inside this check
8507
8513
# program, so it should be modified only carefully...
8508
- cat confdefs.h - << _ACEOF >conftest.$ac_ext
8514
+ cat confdefs.h - << _ACEOF >conftest.$ac_ext
8509
8515
/* end confdefs.h. */
8510
8516
8511
8517
int
8512
8518
main (void)
8513
8519
{
8514
8520
switch (0) {
8515
- case 1: case (sizeof(${tcl_type_64bit} )==sizeof(long)): ;
8516
- }
8521
+ case 1: case (sizeof(${tcl_type_64bit} )==sizeof(long)): ;
8522
+ }
8517
8523
;
8518
8524
return 0;
8519
8525
}
@@ -8671,7 +8677,7 @@ int
8671
8677
main (void)
8672
8678
{
8673
8679
struct dirent64 *p; DIR64 d = opendir64(".");
8674
- p = readdir64(d); rewinddir64(d); closedir64(d);
8680
+ p = readdir64(d); rewinddir64(d); closedir64(d);
8675
8681
;
8676
8682
return 0;
8677
8683
}
@@ -8775,8 +8781,8 @@ esac
8775
8781
fi
8776
8782
8777
8783
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
8780
8786
8781
8787
printf " %s\n" " #define HAVE_TYPE_OFF64_T 1" >> confdefs.h
8782
8788
@@ -9032,7 +9038,7 @@ rm -rf conftest*
9032
9038
9033
9039
PACKAGE_LIB_PREFIX8=" ${PACKAGE_LIB_PREFIX} "
9034
9040
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
9036
9042
PACKAGE_LIB_PREFIX=" ${PACKAGE_LIB_PREFIX9} "
9037
9043
else
9038
9044
PACKAGE_LIB_PREFIX=" ${PACKAGE_LIB_PREFIX8} "
@@ -9063,7 +9069,7 @@ printf "%s\n" "#define TCL_MAJOR_VERSION 8" >>confdefs.h
9063
9069
eval eval " PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX} "
9064
9070
fi
9065
9071
# 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
9067
9073
eval eval " PKG_STUB_LIB_FILE=${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME} stub.a"
9068
9074
else
9069
9075
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
9091
9097
eval eval " PKG_LIB_FILE=lib${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX} "
9092
9098
fi
9093
9099
# 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
9095
9101
eval eval " PKG_STUB_LIB_FILE=lib${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME} stub.a"
9096
9102
else
9097
9103
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
9128
9134
{ printf " %s\n" " $as_me :${as_lineno-$LINENO } : checking for tclsh" >&5
9129
9135
printf %s " checking for tclsh... " >&6 ; }
9130
9136
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
9145
9151
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} "
9162
9168
fi
9163
9169
{ printf " %s\n" " $as_me :${as_lineno-$LINENO } : result: ${TCLSH_PROG} " >&5
9164
9170
printf " %s\n" " ${TCLSH_PROG} " >&6 ; }
0 commit comments