diff options
author | max <max@tclers.tk> | 2014-02-26 12:44:12 (GMT) |
---|---|---|
committer | max <max@tclers.tk> | 2014-02-26 12:44:12 (GMT) |
commit | 7b8b2d52e5298c10a227114f17db436bacceb56c (patch) | |
tree | 153a518a388a7c6e6f9ec74fdb60a20a43484568 /win/configure.in | |
parent | b58c67dddc5793d12e85d5b0066a4660d2b08671 (diff) | |
parent | 259729fa361e6d184ef91be067a93309e14cd998 (diff) | |
download | tcl-7b8b2d52e5298c10a227114f17db436bacceb56c.zip tcl-7b8b2d52e5298c10a227114f17db436bacceb56c.tar.gz tcl-7b8b2d52e5298c10a227114f17db436bacceb56c.tar.bz2 |
Merge trunk
Diffstat (limited to 'win/configure.in')
-rw-r--r-- | win/configure.in | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/win/configure.in b/win/configure.in index 4cc1e9f..77e0327 100644 --- a/win/configure.in +++ b/win/configure.in @@ -350,6 +350,19 @@ else TCL_PACKAGE_PATH="${prefix}/lib" fi +# The tclsh.exe.manifest requires these +# TCL_WIN_VERSION is the 4 dotted pair Windows version format which needs +# the release level, and must account for interim release versioning +case "$TCL_PATCH_LEVEL" in + *a*) TCL_RELEASE_LEVEL=0 ;; + *b*) TCL_RELEASE_LEVEL=1 ;; + *) TCL_RELEASE_LEVEL=2 ;; +esac +TCL_WIN_VERSION="$TCL_VERSION.$TCL_RELEASE_LEVEL.`echo $TCL_PATCH_LEVEL | tr -d ab.`" +AC_SUBST(TCL_WIN_VERSION) +# X86|AMD64|IA64 for manifest +AC_SUBST(MACHINE) + AC_SUBST(TCL_VERSION) AC_SUBST(TCL_MAJOR_VERSION) AC_SUBST(TCL_MINOR_VERSION) @@ -444,7 +457,7 @@ AC_SUBST(RC_DEFINE) AC_SUBST(RC_DEFINES) AC_SUBST(RES) -AC_OUTPUT(Makefile tclConfig.sh tcl.hpj) +AC_OUTPUT(Makefile tclConfig.sh tcl.hpj tclsh.exe.manifest) dnl Local Variables: dnl mode: autoconf; |