Skip to content

Commit 97d947d

Browse files
author
jan.nijtmans
committed
Update to latest PI (3.14) version of TEA
1 parent 15220fd commit 97d947d

1 file changed

Lines changed: 57 additions & 32 deletions

File tree

‎configure‎

Lines changed: 57 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -629,6 +629,8 @@ THREAD_ZIP_FILE
629629
ZIPFS_BUILD
630630
TCLSH_NATIVE
631631
TCLSH_PROG
632+
VC_MANIFEST_EMBED_EXE
633+
VC_MANIFEST_EMBED_DLL
632634
RANLIB_STUB
633635
PKG_STUB_LIB_FILE
634636
MAKE_STUB_LIB
@@ -754,6 +756,7 @@ enable_64bit
754756
enable_64bit_vis
755757
enable_rpath
756758
enable_symbols
759+
with_tclsh
757760
enable_zipfs
758761
'
759762
ac_precious_vars='build_alias
@@ -1403,6 +1406,7 @@ Optional Packages:
14031406
--with-lmdb link with optional LMDB support
14041407
--with-naviserver directory with NaviServer/AOLserver distribution
14051408
--with-tclinclude directory containing the public Tcl header files
1409+
--with-tclsh Path to tclsh executable
14061410
14071411
Some influential environment variables:
14081412
CC C compiler command
@@ -2605,7 +2609,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
26052609
#--------------------------------------------------------------------
26062610

26072611

2608-
TEA_VERSION="3.13"
2612+
TEA_VERSION="3.14"
26092613

26102614
{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking TEA configuration" >&5
26112615
printf %s "checking TEA configuration... " >&6; }
@@ -2763,7 +2767,7 @@ printf '%s\n' "$tcl_cv_sys_version" >&6; }
27632767
system=$tcl_cv_sys_version
27642768

27652769
case $system in
2766-
HP-UX-*) INSTALL_LIBRARY='${INSTALL} -m 755' ;;
2770+
CYGWIN_*|MINGW32_*|MINGW64_*|MSYS_*|HP-UX-*) INSTALL_LIBRARY='${INSTALL} -m 755' ;;
27672771
*) INSTALL_LIBRARY='${INSTALL} -m 644' ;;
27682772
esac
27692773

@@ -9456,12 +9460,19 @@ printf '%s\n' "$ac_cv_path_EGREP_TRADITIONAL" >&6; }
94569460
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
94579461
/* end confdefs.h. */
94589462
9463+
#if defined(_MSC_VER) && _MSC_VER >= 1400
9464+
print("manifest needed")
9465+
#endif
94599466
94609467
_ACEOF
94619468
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
94629469
$EGREP_TRADITIONAL "manifest needed" >/dev/null 2>&1
94639470
then :
94649471

9472+
# Could do a CHECK_PROG for mt, but should always be with MSVC8+
9473+
VC_MANIFEST_EMBED_DLL="if test -f \$@.manifest ; then mt.exe -nologo -manifest \$@.manifest -outputresource:\$@\;2 ; fi"
9474+
VC_MANIFEST_EMBED_EXE="if test -f \$@.manifest ; then mt.exe -nologo -manifest \$@.manifest -outputresource:\$@\;1 ; fi"
9475+
MAKE_SHARED_LIB="${MAKE_SHARED_LIB} ; ${VC_MANIFEST_EMBED_DLL}"
94659476

94669477
CLEANFILES="$CLEANFILES *.manifest"
94679478

@@ -9620,6 +9631,8 @@ printf '%s\n' "$tcl_cv_ld_high_entropy" >&6; }
96209631

96219632

96229633

9634+
9635+
96239636
#--------------------------------------------------------------------
96249637
# Determine the name of the tclsh and/or wish executables in the
96259638
# Tcl and Tk build directories or the location they were installed
@@ -9629,40 +9642,52 @@ printf '%s\n' "$tcl_cv_ld_high_entropy" >&6; }
96299642
#--------------------------------------------------------------------
96309643

96319644

9645+
9646+
# Check whether --with-tclsh was given.
9647+
if test ${with_tclsh+y}
9648+
then :
9649+
withval=$with_tclsh; with_tclsh="${withval}"
9650+
fi
9651+
96329652
{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for tclsh" >&5
96339653
printf %s "checking for tclsh... " >&6; }
9634-
if test -f "${TCL_BIN_DIR}/Makefile" ; then
9635-
# tclConfig.sh is in Tcl build directory
9636-
if test "${TEA_PLATFORM}" = "windows"; then
9637-
if test -f "${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${EXEEXT}" ; then
9638-
TCLSH_PROG="${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${EXEEXT}"
9639-
elif test -f "${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}s${EXEEXT}" ; then
9640-
TCLSH_PROG="${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}s${EXEEXT}"
9641-
elif test -f "${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}t${EXEEXT}" ; then
9642-
TCLSH_PROG="${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}t${EXEEXT}"
9643-
elif test -f "${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}st${EXEEXT}" ; then
9644-
TCLSH_PROG="${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}st${EXEEXT}"
9645-
fi
9646-
else
9647-
TCLSH_PROG="${TCL_BIN_DIR}/tclsh"
9648-
fi
9649-
else
9650-
# tclConfig.sh is in install location
9651-
if test "${TEA_PLATFORM}" = "windows"; then
9652-
TCLSH_PROG="tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${EXEEXT}"
9654+
if test x"${with_tclsh}" != x; then
9655+
TCLSH_PROG=${with_tclsh}
9656+
fi
9657+
if test x"${TCLSH_PROG}" = x; then
9658+
if test -f "${TCL_BIN_DIR}/Makefile" ; then
9659+
# tclConfig.sh is in Tcl build directory
9660+
if test "${TEA_PLATFORM}" = "windows"; then
9661+
if test -f "${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${EXEEXT}" ; then
9662+
TCLSH_PROG="${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${EXEEXT}"
9663+
elif test -f "${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}s${EXEEXT}" ; then
9664+
TCLSH_PROG="${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}s${EXEEXT}"
9665+
elif test -f "${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}t${EXEEXT}" ; then
9666+
TCLSH_PROG="${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}t${EXEEXT}"
9667+
elif test -f "${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}st${EXEEXT}" ; then
9668+
TCLSH_PROG="${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}st${EXEEXT}"
9669+
fi
9670+
else
9671+
TCLSH_PROG="${TCL_BIN_DIR}/tclsh"
9672+
fi
96539673
else
9654-
TCLSH_PROG="tclsh${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}"
9655-
fi
9656-
list="`ls -d ${TCL_BIN_DIR}/../bin 2>/dev/null` \
9657-
`ls -d ${TCL_BIN_DIR}/.. 2>/dev/null` \
9658-
`ls -d ${TCL_PREFIX}/bin 2>/dev/null`"
9659-
for i in $list ; do
9660-
if test -f "$i/${TCLSH_PROG}" ; then
9661-
REAL_TCL_BIN_DIR="`cd "$i"; pwd`/"
9662-
break
9674+
# tclConfig.sh is in install location
9675+
if test "${TEA_PLATFORM}" = "windows"; then
9676+
TCLSH_PROG="tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${EXEEXT}"
9677+
else
9678+
TCLSH_PROG="tclsh${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}"
96639679
fi
9664-
done
9665-
TCLSH_PROG="${REAL_TCL_BIN_DIR}${TCLSH_PROG}"
9680+
list="`ls -d ${TCL_BIN_DIR}/../bin 2>/dev/null` \
9681+
`ls -d ${TCL_BIN_DIR}/.. 2>/dev/null` \
9682+
`ls -d ${TCL_PREFIX}/bin 2>/dev/null`"
9683+
for i in $list ; do
9684+
if test -f "$i/${TCLSH_PROG}" ; then
9685+
REAL_TCL_BIN_DIR="`cd "$i"; pwd`/"
9686+
break
9687+
fi
9688+
done
9689+
TCLSH_PROG="${REAL_TCL_BIN_DIR}${TCLSH_PROG}"
9690+
fi
96669691
fi
96679692
{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: ${TCLSH_PROG}" >&5
96689693
printf '%s\n' "${TCLSH_PROG}" >&6; }

0 commit comments

Comments
 (0)