Update to tk 8.5.19
This commit is contained in:
Zachary Ware
52
win/configure
vendored
Normal file → Executable file
52
win/configure
vendored
Normal file → Executable file
@@ -309,7 +309,7 @@ ac_includes_default="\
|
||||
# include <unistd.h>
|
||||
#endif"
|
||||
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP AR ac_ct_AR RANLIB ac_ct_RANLIB RC ac_ct_RC SET_MAKE TCL_THREADS TCL_VERSION TCL_BIN_DIR TCL_SRC_DIR TCL_LIB_FILE TCL_LIB_FLAG TCL_LIB_SPEC TCL_STUB_LIB_FILE TCL_STUB_LIB_FLAG TCL_STUB_LIB_SPEC TCL_DEFS CYGPATH CELIB_DIR DL_LIBS CFLAGS_DEBUG CFLAGS_OPTIMIZE CFLAGS_WARNING MAN2TCLFLAGS CFLAGS_DEFAULT LDFLAGS_DEFAULT VC_MANIFEST_EMBED_DLL VC_MANIFEST_EMBED_EXE BUILD_TCLSH TCLSH_PROG TK_WIN_VERSION MACHINE TK_VERSION TK_MAJOR_VERSION TK_MINOR_VERSION TK_PATCH_LEVEL TK_DBGX TK_LIB_FILE TK_DLL_FILE TK_STUB_LIB_FILE TK_STUB_LIB_FLAG TK_BUILD_STUB_LIB_SPEC TK_SRC_DIR TK_BIN_DIR TCL_MAJOR_VERSION TCL_MINOR_VERSION TCL_PATCH_LEVEL TCL_DBGX CFG_TK_SHARED_LIB_SUFFIX CFG_TK_UNSHARED_LIB_SUFFIX CFG_TK_EXPORT_FILE_SUFFIX TK_SHARED_BUILD DEPARG EXTRA_CFLAGS STLIB_LD SHLIB_LD SHLIB_LD_LIBS SHLIB_CFLAGS SHLIB_SUFFIX CC_OBJNAME CC_EXENAME LDFLAGS_DEBUG LDFLAGS_OPTIMIZE LDFLAGS_CONSOLE LDFLAGS_WINDOW RC_OUT RC_TYPE RC_INCLUDE RC_DEFINE RC_DEFINES TK_RES RES LIBS_GUI DLLSUFFIX LIBPREFIX LIBSUFFIX EXESUFFIX LIBRARIES MAKE_LIB POST_MAKE_LIB MAKE_DLL MAKE_EXE TK_LIB_FLAG TK_LIB_SPEC TK_BUILD_LIB_SPEC TK_STUB_LIB_SPEC TK_STUB_LIB_PATH TK_BUILD_STUB_LIB_PATH TK_CC_SEARCH_FLAGS TK_LD_SEARCH_FLAGS LIBOBJS LTLIBOBJS'
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP AR ac_ct_AR RANLIB ac_ct_RANLIB RC ac_ct_RC SET_MAKE TCL_THREADS TCL_VERSION TCL_BIN_DIR TCL_SRC_DIR TCL_LIB_FILE TCL_LIB_FLAG TCL_LIB_SPEC TCL_STUB_LIB_FILE TCL_STUB_LIB_FLAG TCL_STUB_LIB_SPEC TCL_DEFS CYGPATH CELIB_DIR DL_LIBS CFLAGS_DEBUG CFLAGS_OPTIMIZE CFLAGS_WARNING MAN2TCLFLAGS CFLAGS_DEFAULT LDFLAGS_DEFAULT VC_MANIFEST_EMBED_DLL VC_MANIFEST_EMBED_EXE BUILD_TCLSH TCLSH_PROG TK_WIN_VERSION MACHINE TK_VERSION TK_MAJOR_VERSION TK_MINOR_VERSION TK_PATCH_LEVEL TK_DBGX TK_LIB_FILE TK_DLL_FILE TK_STUB_LIB_FILE TK_STUB_LIB_FLAG TK_BUILD_STUB_LIB_SPEC TK_SRC_DIR TK_BIN_DIR TCL_MAJOR_VERSION TCL_MINOR_VERSION TCL_PATCH_LEVEL TCL_DBGX CFG_TK_SHARED_LIB_SUFFIX CFG_TK_UNSHARED_LIB_SUFFIX CFG_TK_EXPORT_FILE_SUFFIX TK_SHARED_BUILD DEPARG EXTRA_CFLAGS STLIB_LD SHLIB_LD SHLIB_LD_LIBS SHLIB_CFLAGS SHLIB_SUFFIX CC_OBJNAME CC_EXENAME LDFLAGS_DEBUG LDFLAGS_OPTIMIZE LDFLAGS_CONSOLE LDFLAGS_WINDOW RC_OUT RC_TYPE RC_INCLUDE RC_DEFINE RC_DEFINES TK_RES RES LIBS_GUI DLLSUFFIX LIBPREFIX LIBSUFFIX EXESUFFIX LIBRARIES MAKE_LIB MAKE_STUB_LIB POST_MAKE_LIB MAKE_DLL MAKE_EXE TK_LIB_FLAG TK_LIB_SPEC TK_BUILD_LIB_SPEC TK_STUB_LIB_SPEC TK_STUB_LIB_PATH TK_BUILD_STUB_LIB_PATH TK_CC_SEARCH_FLAGS TK_LD_SEARCH_FLAGS LIBOBJS LTLIBOBJS'
|
||||
ac_subst_files=''
|
||||
|
||||
# Initialize some variables set by options.
|
||||
@@ -1312,7 +1312,7 @@ SHELL=/bin/sh
|
||||
TK_VERSION=8.5
|
||||
TK_MAJOR_VERSION=8
|
||||
TK_MINOR_VERSION=5
|
||||
TK_PATCH_LEVEL=".15"
|
||||
TK_PATCH_LEVEL=".19"
|
||||
VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
@@ -3425,7 +3425,7 @@ do
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||||
ac_cv_prog_CYGPATH="cygpath -w"
|
||||
ac_cv_prog_CYGPATH="cygpath -m"
|
||||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
@@ -3574,6 +3574,8 @@ echo "${ECHO_T}yes" >&6
|
||||
# set various compiler flags depending on whether we are using gcc or cl
|
||||
|
||||
if test "${GCC}" = "yes" ; then
|
||||
extra_cflags="-pipe"
|
||||
extra_ldflags="-pipe -static-libgcc"
|
||||
echo "$as_me:$LINENO: checking for mingw32 version of gcc" >&5
|
||||
echo $ECHO_N "checking for mingw32 version of gcc... $ECHO_C" >&6
|
||||
if test "${ac_cv_win32+set}" = set; then
|
||||
@@ -3654,13 +3656,11 @@ echo $ECHO_N "checking compiler flags... $ECHO_C" >&6
|
||||
RC_DEFINE=--define
|
||||
RES=res.o
|
||||
MAKE_LIB="\${STLIB_LD} \$@"
|
||||
MAKE_STUB_LIB="\${STLIB_LD} \$@"
|
||||
POST_MAKE_LIB="\${RANLIB} \$@"
|
||||
MAKE_EXE="\${CC} -o \$@"
|
||||
LIBPREFIX="lib"
|
||||
|
||||
extra_cflags="-pipe"
|
||||
extra_ldflags="-pipe"
|
||||
|
||||
if test "${SHARED_BUILD}" = "0" ; then
|
||||
# static
|
||||
echo "$as_me:$LINENO: result: using static flags" >&5
|
||||
@@ -3687,9 +3687,8 @@ echo "$as_me: error: ${CC} does not support the -shared option.
|
||||
|
||||
runtime=
|
||||
# Link with gcc since ld does not link to default libs like
|
||||
# -luser32 and -lmsvcrt by default. Make sure CFLAGS is
|
||||
# included so -mno-cygwin passed the correct libs to the linker.
|
||||
SHLIB_LD='${CC} -shared ${CFLAGS}'
|
||||
# -luser32 and -lmsvcrt by default.
|
||||
SHLIB_LD='${CC} -shared'
|
||||
SHLIB_LD_LIBS='${LIBS}'
|
||||
# Add SHLIB_LD_LIBS to the Make rule, not here.
|
||||
MAKE_DLL="\${SHLIB_LD} \$(LDFLAGS) -o \$@ ${extra_ldflags} \
|
||||
@@ -3828,6 +3827,13 @@ echo "${ECHO_T}using shared flags" >&6
|
||||
EXESUFFIX="\${DBGX}.exe"
|
||||
LIBRARIES="\${SHARED_LIBRARIES}"
|
||||
SHLIB_LD_LIBS='${LIBS}'
|
||||
case "x`echo \${VisualStudioVersion}`" in
|
||||
x1[4-9]*)
|
||||
lflags="${lflags} -nodefaultlib:libucrt.lib"
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
# DLLSUFFIX is separate because it is the building block for
|
||||
# users of tclConfig.sh that may build shared or static.
|
||||
@@ -3853,18 +3859,23 @@ echo "${ECHO_T}using shared flags" >&6
|
||||
;;
|
||||
esac
|
||||
if test ! -d "${PATH64}" ; then
|
||||
{ echo "$as_me:$LINENO: WARNING: Could not find 64-bit $MACHINE SDK to enable 64bit mode" >&5
|
||||
echo "$as_me: WARNING: Could not find 64-bit $MACHINE SDK to enable 64bit mode" >&2;}
|
||||
{ echo "$as_me:$LINENO: WARNING: Ensure latest Platform SDK is installed" >&5
|
||||
echo "$as_me: WARNING: Ensure latest Platform SDK is installed" >&2;}
|
||||
do64bit="no"
|
||||
else
|
||||
echo "$as_me:$LINENO: result: Using 64-bit $MACHINE mode" >&5
|
||||
echo "${ECHO_T} Using 64-bit $MACHINE mode" >&6
|
||||
{ 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
|
||||
|
||||
LIBS="user32.lib advapi32.lib ws2_32.lib"
|
||||
|
||||
case "x`echo \${VisualStudioVersion}`" in
|
||||
x1[4-9]*)
|
||||
LIBS="$LIBS ucrt.lib"
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
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
|
||||
@@ -3939,7 +3950,7 @@ fi
|
||||
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="-nologo -MACHINE:${MACHINE} -LIBPATH:\"${MSSDK}/Lib/${MACHINE}\""
|
||||
lflags="${lflags} -nologo -MACHINE:${MACHINE} -LIBPATH:\"${MSSDK}/Lib/${MACHINE}\""
|
||||
LINKBIN="\"${PATH64}/link.exe\""
|
||||
# Avoid 'unresolved external symbol __security_cookie' errors.
|
||||
# c.f. http://support.microsoft.com/?id=894573
|
||||
@@ -3951,7 +3962,7 @@ fi
|
||||
CFLAGS_DEBUG="-nologo -Z7 -Od -WX ${runtime}d"
|
||||
# -O2 - create fast code (/Og /Oi /Ot /Oy /Ob2 /Gs /GF /Gy)
|
||||
CFLAGS_OPTIMIZE="-nologo -O2 ${runtime}"
|
||||
lflags="-nologo"
|
||||
lflags="${lflags} -nologo"
|
||||
LINKBIN="link"
|
||||
fi
|
||||
|
||||
@@ -4070,6 +4081,7 @@ _ACEOF
|
||||
RC_DEFINE=-d
|
||||
RES=res
|
||||
MAKE_LIB="\${STLIB_LD} -out:\$@"
|
||||
MAKE_STUB_LIB="\${STLIB_LD} -nodefaultlib -out:\$@"
|
||||
POST_MAKE_LIB=
|
||||
MAKE_EXE="\${CC} -Fe\$@"
|
||||
LIBPREFIX=""
|
||||
@@ -5005,6 +5017,7 @@ TK_WIN_VERSION="$TK_VERSION.$TK_RELEASE_LEVEL.`echo $TK_PATCH_LEVEL | tr -d ab.`
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
# undefined at this point for win
|
||||
@@ -5737,6 +5750,7 @@ s,@LIBSUFFIX@,$LIBSUFFIX,;t t
|
||||
s,@EXESUFFIX@,$EXESUFFIX,;t t
|
||||
s,@LIBRARIES@,$LIBRARIES,;t t
|
||||
s,@MAKE_LIB@,$MAKE_LIB,;t t
|
||||
s,@MAKE_STUB_LIB@,$MAKE_STUB_LIB,;t t
|
||||
s,@POST_MAKE_LIB@,$POST_MAKE_LIB,;t t
|
||||
s,@MAKE_DLL@,$MAKE_DLL,;t t
|
||||
s,@MAKE_EXE@,$MAKE_EXE,;t t
|
||||
|
||||
Reference in New Issue
Block a user