diff options
Diffstat (limited to 'win/configure.in')
-rw-r--r-- | win/configure.in | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/win/configure.in b/win/configure.in index 48ee9ed..f8d71a8 100644 --- a/win/configure.in +++ b/win/configure.in @@ -3,7 +3,7 @@ # generate the file "configure", which is run during Tk installation # to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.78 2008/04/01 16:30:56 dgp Exp $ +# RCS: @(#) $Id: configure.in,v 1.79 2008/06/13 21:49:31 hobbs Exp $ AC_INIT(../generic/tk.h) AC_PREREQ(2.59) @@ -230,14 +230,14 @@ else fi # The wish.exe.manifest requires these -# TK_WIN_VERSION is the 4 dotted pair Windows version format -# Make sure the patch level doesn't contain extra dotted pairs (interim rel) -AB_PATCH_LEVEL="`echo $TK_PATCH_LEVEL | sed -e 's/\..*//'`" +# TK_WIN_VERSION is the 4 dotted pair Windows version format which needs +# the release level, and must account for interim release versioning case "$TK_PATCH_LEVEL" in - a*) TK_WIN_VERSION="$TK_VERSION.0.`echo $AB_PATCH_LEVEL | tr -d a`" ;; - b*) TK_WIN_VERSION="$TK_VERSION.1.`echo $AB_PATCH_LEVEL | tr -d b`" ;; - .*) TK_WIN_VERSION="$TK_VERSION.2$TK_PATCH_LEVEL" ;; + *a*) TK_RELEASE_LEVEL=0 ;; + *b*) TK_RELEASE_LEVEL=1 ;; + *) TK_RELEASE_LEVEL=2 ;; esac +TK_WIN_VERSION="$TK_VERSION.$TK_RELEASE_LEVEL.`echo $TK_PATCH_LEVEL | tr -d ab.`" AC_SUBST(TK_WIN_VERSION) # X86|AMD64|IA64 for manifest AC_SUBST(MACHINE) |