Import Tcl 8.6.11
This commit is contained in:
Steve Dower
279
win/configure
vendored
279
win/configure
vendored
@@ -1312,7 +1312,7 @@ SHELL=/bin/sh
|
||||
TCL_VERSION=8.6
|
||||
TCL_MAJOR_VERSION=8
|
||||
TCL_MINOR_VERSION=6
|
||||
TCL_PATCH_LEVEL=".10"
|
||||
TCL_PATCH_LEVEL=".11"
|
||||
VER=$TCL_MAJOR_VERSION$TCL_MINOR_VERSION
|
||||
|
||||
TCL_DDE_VERSION=1.4
|
||||
@@ -3133,14 +3133,6 @@ if test "${enable_shared+set}" = set; then
|
||||
else
|
||||
tcl_ok=yes
|
||||
fi;
|
||||
|
||||
if test "${enable_shared+set}" = set; then
|
||||
enableval="$enable_shared"
|
||||
tcl_ok=$enableval
|
||||
else
|
||||
tcl_ok=yes
|
||||
fi
|
||||
|
||||
if test "$tcl_ok" = "yes" ; then
|
||||
echo "$as_me:$LINENO: result: shared" >&5
|
||||
echo "${ECHO_T}shared" >&6
|
||||
@@ -3182,78 +3174,6 @@ fi
|
||||
# after SC_ENABLE_SHARED checks the configure switches.
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
# On IRIX 5.3, sys/types and inttypes.h are conflicting.
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
|
||||
inttypes.h stdint.h unistd.h
|
||||
do
|
||||
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
||||
echo "$as_me:$LINENO: checking for $ac_header" >&5
|
||||
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
|
||||
if eval "test \"\${$as_ac_Header+set}\" = set"; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
$ac_includes_default
|
||||
|
||||
#include <$ac_header>
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; } &&
|
||||
{ ac_try='test -s conftest.$ac_objext'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
eval "$as_ac_Header=yes"
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
eval "$as_ac_Header=no"
|
||||
fi
|
||||
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
|
||||
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
|
||||
if test `eval echo '${'$as_ac_Header'}'` = yes; then
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
|
||||
done
|
||||
|
||||
|
||||
|
||||
|
||||
# Step 0: Enable 64 bit support?
|
||||
@@ -3412,14 +3332,14 @@ echo "${ECHO_T}$ac_cv_cross" >&6
|
||||
if test "$ac_cv_cross" = "yes"; then
|
||||
case "$do64bit" in
|
||||
amd64|x64|yes)
|
||||
CC="x86_64-w64-mingw32-gcc"
|
||||
CC="x86_64-w64-mingw32-${CC}"
|
||||
LD="x86_64-w64-mingw32-ld"
|
||||
AR="x86_64-w64-mingw32-ar"
|
||||
RANLIB="x86_64-w64-mingw32-ranlib"
|
||||
RC="x86_64-w64-mingw32-windres"
|
||||
;;
|
||||
*)
|
||||
CC="i686-w64-mingw32-gcc"
|
||||
CC="i686-w64-mingw32-${CC}"
|
||||
LD="i686-w64-mingw32-ld"
|
||||
AR="i686-w64-mingw32-ar"
|
||||
RANLIB="i686-w64-mingw32-ranlib"
|
||||
@@ -3656,7 +3576,7 @@ echo "$as_me: error: ${CC} does not support the -shared option.
|
||||
SHLIB_LD='${CC} -shared'
|
||||
SHLIB_LD_LIBS='${LIBS}'
|
||||
MAKE_DLL="\${SHLIB_LD} \$(LDFLAGS) -o \$@ ${extra_ldflags} \
|
||||
-Wl,--out-implib,\$(patsubst %.dll,lib%.a,\$@)"
|
||||
-Wl,--out-implib,\$(patsubst %.dll,lib%.dll.a,\$@)"
|
||||
# DLLSUFFIX is separate because it is the building block for
|
||||
# users of tclConfig.sh that may build shared or static.
|
||||
DLLSUFFIX="\${DBGX}.dll"
|
||||
@@ -3668,10 +3588,19 @@ echo "$as_me: error: ${CC} does not support the -shared option.
|
||||
|
||||
CFLAGS_DEBUG=-g
|
||||
CFLAGS_OPTIMIZE="-O2 -fomit-frame-pointer"
|
||||
CFLAGS_WARNING="-Wall -Wdeclaration-after-statement"
|
||||
CFLAGS_WARNING="-Wall -Wpointer-arith"
|
||||
LDFLAGS_DEBUG=
|
||||
LDFLAGS_OPTIMIZE=
|
||||
|
||||
case "${CC}" in
|
||||
*++)
|
||||
CFLAGS_WARNING="${CFLAGS_WARNING} -Wno-format"
|
||||
;;
|
||||
*)
|
||||
CFLAGS_WARNING="${CFLAGS_WARNING} -Wdeclaration-after-statement"
|
||||
;;
|
||||
esac
|
||||
|
||||
# Specify the CC output file names based on the target name
|
||||
CC_OBJNAME="-o \$@"
|
||||
CC_EXENAME="-o \$@"
|
||||
@@ -3794,29 +3723,15 @@ echo "${ECHO_T}using shared flags" >&6
|
||||
LIBSUFFIX="\${DBGX}.lib"
|
||||
LIBFLAGSUFFIX="\${DBGX}"
|
||||
|
||||
# This is a 2-stage check to make sure we have the 64-bit SDK
|
||||
# We have to know where the SDK is installed.
|
||||
# This magic is based on MS Platform SDK for Win2003 SP1 - hobbs
|
||||
if test "$do64bit" != "no" ; then
|
||||
if test "x${MSSDK}x" = "xx" ; then
|
||||
MSSDK="C:/Progra~1/Microsoft Platform SDK"
|
||||
fi
|
||||
MSSDK=`echo "$MSSDK" | sed -e 's!\\\!/!g'`
|
||||
PATH64=""
|
||||
case "$do64bit" in
|
||||
amd64|x64|yes)
|
||||
MACHINE="AMD64" ; # assume AMD64 as default 64-bit build
|
||||
PATH64="${MSSDK}/Bin/Win64/x86/AMD64"
|
||||
;;
|
||||
ia64)
|
||||
MACHINE="IA64"
|
||||
PATH64="${MSSDK}/Bin/Win64"
|
||||
;;
|
||||
esac
|
||||
if test ! -d "${PATH64}" ; then
|
||||
{ echo "$as_me:$LINENO: WARNING: Could not find 64-bit $MACHINE SDK" >&5
|
||||
echo "$as_me: WARNING: Could not find 64-bit $MACHINE SDK" >&2;}
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: Using 64-bit $MACHINE mode" >&5
|
||||
echo "${ECHO_T} Using 64-bit $MACHINE mode" >&6
|
||||
fi
|
||||
@@ -3832,81 +3747,12 @@ echo "${ECHO_T} Using 64-bit $MACHINE mode" >&6
|
||||
esac
|
||||
|
||||
if test "$do64bit" != "no" ; then
|
||||
# The space-based-path will work for the Makefile, but will
|
||||
# not work if AC_TRY_COMPILE is called. TEA has the
|
||||
# TEA_PATH_NOSPACE to avoid this issue.
|
||||
# Check if _WIN64 is already recognized, and if so we don't
|
||||
# need to modify CC.
|
||||
echo "$as_me:$LINENO: checking whether _WIN64 is declared" >&5
|
||||
echo $ECHO_N "checking whether _WIN64 is declared... $ECHO_C" >&6
|
||||
if test "${ac_cv_have_decl__WIN64+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
$ac_includes_default
|
||||
int
|
||||
main ()
|
||||
{
|
||||
#ifndef _WIN64
|
||||
char *p = (char *) _WIN64;
|
||||
#endif
|
||||
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; } &&
|
||||
{ ac_try='test -s conftest.$ac_objext'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
ac_cv_have_decl__WIN64=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ac_cv_have_decl__WIN64=no
|
||||
fi
|
||||
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $ac_cv_have_decl__WIN64" >&5
|
||||
echo "${ECHO_T}$ac_cv_have_decl__WIN64" >&6
|
||||
if test $ac_cv_have_decl__WIN64 = yes; then
|
||||
:
|
||||
else
|
||||
CC="\"${PATH64}/cl.exe\" -I\"${MSSDK}/Include\" \
|
||||
-I\"${MSSDK}/Include/crt\" \
|
||||
-I\"${MSSDK}/Include/crt/sys\""
|
||||
fi
|
||||
|
||||
RC="\"${MSSDK}/bin/rc.exe\""
|
||||
RC="rc"
|
||||
CFLAGS_DEBUG="-nologo -Zi -Od ${runtime}d"
|
||||
# Do not use -O2 for Win64 - this has proved buggy in code gen.
|
||||
CFLAGS_OPTIMIZE="-nologo -O1 ${runtime}"
|
||||
lflags="${lflags} -nologo -MACHINE:${MACHINE} -LIBPATH:\"${MSSDK}/Lib/${MACHINE}\""
|
||||
LINKBIN="\"${PATH64}/link.exe\""
|
||||
lflags="${lflags} -nologo -MACHINE:${MACHINE}"
|
||||
LINKBIN="link"
|
||||
# Avoid 'unresolved external symbol __security_cookie' errors.
|
||||
# c.f. http://support.microsoft.com/?id=894573
|
||||
LIBS="$LIBS bufferoverflowU.lib"
|
||||
@@ -4430,6 +4276,78 @@ cat >>confdefs.h <<\_ACEOF
|
||||
_ACEOF
|
||||
|
||||
|
||||
# On IRIX 5.3, sys/types and inttypes.h are conflicting.
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
|
||||
inttypes.h stdint.h unistd.h
|
||||
do
|
||||
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
||||
echo "$as_me:$LINENO: checking for $ac_header" >&5
|
||||
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
|
||||
if eval "test \"\${$as_ac_Header+set}\" = set"; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
$ac_includes_default
|
||||
|
||||
#include <$ac_header>
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; } &&
|
||||
{ ac_try='test -s conftest.$ac_objext'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
eval "$as_ac_Header=yes"
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
eval "$as_ac_Header=no"
|
||||
fi
|
||||
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
|
||||
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
|
||||
if test `eval echo '${'$as_ac_Header'}'` = yes; then
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
|
||||
done
|
||||
|
||||
|
||||
echo "$as_me:$LINENO: checking for intptr_t" >&5
|
||||
echo $ECHO_N "checking for intptr_t... $ECHO_C" >&6
|
||||
if test "${ac_cv_type_intptr_t+set}" = set; then
|
||||
@@ -5138,10 +5056,6 @@ TCL_SHARED_BUILD=${SHARED_BUILD}
|
||||
# Perform final evaluations of variables with possible substitutions.
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
TCL_SHARED_LIB_SUFFIX="\${NODOT_VERSION}${DLLSUFFIX}"
|
||||
TCL_UNSHARED_LIB_SUFFIX="\${NODOT_VERSION}${LIBSUFFIX}"
|
||||
TCL_EXPORT_FILE_SUFFIX="\${NODOT_VERSION}${LIBSUFFIX}"
|
||||
|
||||
eval "TCL_SRC_DIR=\"`cd $srcdir/..; $CYGPATH $(pwd)`\""
|
||||
|
||||
eval "TCL_DLL_FILE=tcl${VER}${DLLSUFFIX}"
|
||||
@@ -5153,19 +5067,26 @@ eval "TCL_STUB_LIB_SPEC=\"-L${libdir} ${TCL_STUB_LIB_FLAG}\""
|
||||
eval "TCL_BUILD_STUB_LIB_PATH=\"`$CYGPATH $(pwd)`/${TCL_STUB_LIB_FILE}\""
|
||||
eval "TCL_STUB_LIB_PATH=\"${libdir}/${TCL_STUB_LIB_FILE}\""
|
||||
|
||||
eval "TCL_LIB_FILE=\"${LIBPREFIX}tcl${VER}${LIBSUFFIX}\""
|
||||
if test ${SHARED_BUILD} = 0 ; then
|
||||
eval "TCL_LIB_FILE=\"${LIBPREFIX}tcl${VER}${LIBSUFFIX}\""
|
||||
else
|
||||
eval "TCL_LIB_FILE=\"${LIBPREFIX}tcl${VER}${DLLSUFFIX}.a\""
|
||||
fi
|
||||
eval "TCL_BUILD_LIB_SPEC=\"-L`$CYGPATH $(pwd)` -ltcl${VER}${FLAGSUFFIX}\""
|
||||
eval "TCL_LIB_SPEC=\"-L${libdir} -ltcl${VER}${FLAGSUFFIX}\""
|
||||
|
||||
# Install time header dir can be set via --includedir
|
||||
eval "TCL_INCLUDE_SPEC=\"-I${includedir}\""
|
||||
|
||||
|
||||
eval "DLLSUFFIX=${DLLSUFFIX}"
|
||||
eval "LIBPREFIX=${LIBPREFIX}"
|
||||
eval "LIBSUFFIX=${LIBSUFFIX}"
|
||||
eval "EXESUFFIX=${EXESUFFIX}"
|
||||
|
||||
TCL_SHARED_LIB_SUFFIX="\${NODOT_VERSION}${DLLSUFFIX}"
|
||||
TCL_UNSHARED_LIB_SUFFIX="\${NODOT_VERSION}${LIBSUFFIX}"
|
||||
TCL_EXPORT_FILE_SUFFIX="\${NODOT_VERSION}${LIBSUFFIX}"
|
||||
|
||||
CFG_TCL_SHARED_LIB_SUFFIX=${TCL_SHARED_LIB_SUFFIX}
|
||||
CFG_TCL_UNSHARED_LIB_SUFFIX=${TCL_UNSHARED_LIB_SUFFIX}
|
||||
CFG_TCL_EXPORT_FILE_SUFFIX=${TCL_EXPORT_FILE_SUFFIX}
|
||||
@@ -5197,9 +5118,9 @@ fi
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
if test "$prefix/lib" != "$libdir"; then
|
||||
TCL_PACKAGE_PATH="${libdir} ${prefix}/lib"
|
||||
TCL_PACKAGE_PATH="{${libdir}} {${prefix}/lib}"
|
||||
else
|
||||
TCL_PACKAGE_PATH="${prefix}/lib"
|
||||
TCL_PACKAGE_PATH="{${prefix}/lib}"
|
||||
fi
|
||||
|
||||
# The tclsh.exe.manifest requires these
|
||||
|
||||
Reference in New Issue
Block a user