From dacb88902ea4254261dfedbf4c2a721c63b427a4 Mon Sep 17 00:00:00 2001
From: Pat Thoyts <patthoyts@users.sourceforge.net>
Date: Mon, 22 Jun 2009 23:36:19 +0000
Subject: [PATCH] Fixed generation of the tcl::pkgconfig built-in strings to
 use utf-8 encoding. These need an encoding that is valid when these strings
 are loaded in which occurs before the vfs is mounted.

git-svn-id: svn://svn.equi4.com/kitgen/trunk@4715 9e558909-932a-0410-a563-af77432da1eb
---
 Makefile.vc  | 12 ++++++++++--
 validate.tcl |  5 +++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/Makefile.vc b/Makefile.vc
index 716fb0b..1cec71f 100644
--- a/Makefile.vc
+++ b/Makefile.vc
@@ -62,6 +62,14 @@ LINK    = link -nologo
 CFLAGS  = -W3 -D_WINDOWS -DWIN32 -DSTATIC_BUILD
 BUILD   = $(MAKEDIR)\build
 
+# NOTE: if you do this then the tcl::pkgconfig command will
+#       work but you better ensure that the paths you embed
+#       a actually utf-8 (in reality - ASCII).
+#       Without this, the registration of the pkgconfig data will
+#       fail becuase cp1252 is unavailable at registration time.
+TCL_MAKE_FLAGS = CFG_ENCODING="\"\\\"utf-8\\\"\""
+TK_MAKE_FLAGS = $(TCL_MAKE_FLAGS)
+
 !if $V == 84
 PARTS   = vqtcl vfs
 OPTS    = static,msvcrt
@@ -250,7 +258,7 @@ kit.exe: setup tcl tk mk itcl $(PARTS:vqtcl=) files $(GUIOBJS)
 tcl: $(BUILD)\lib\tcl$V$X.lib
 $(BUILD)\lib\tcl$V$X.lib:
 	pushd ..\tcl\win & $(MAKE) -f Makefile.vc INSTALLDIR=$(BUILD) \
-	  OPTS=$(OPTS) TMP_DIR=$(BUILD)\tcl \
+	  OPTS=$(OPTS) TMP_DIR=$(BUILD)\tcl $(TCL_MAKE_FLAGS) \
 	  OUT_DIR=$(BUILD)\tcl release & \
 	  $(MAKE) -f Makefile.vc INSTALLDIR=$(BUILD) \
 	  OPTS=$(OPTS) TMP_DIR=$(BUILD)\tcl \
@@ -259,7 +267,7 @@ $(BUILD)\lib\tcl$V$X.lib:
 tk: $(BUILD)\lib\tk$V$X.lib
 $(BUILD)\lib\tk$V$X.lib:
 	pushd ..\tk\win & $(MAKE) -f Makefile.vc INSTALLDIR=$(BUILD) \
-	  TCLDIR=$(BUILD)\..\..\tcl OPTS=$(OPTS) \
+	  TCLDIR=$(BUILD)\..\..\tcl OPTS=$(OPTS) $(TK_MAKE_FLAGS) \
 	  TMP_DIR=$(BUILD)\tk OUT_DIR=$(BUILD)\tk \
 	  core $(BUILD)\tk\wish.res install-libraries
 	$(COPY) $(BUILD)\tk\tk$V$X.lib $(BUILD)\lib
diff --git a/validate.tcl b/validate.tcl
index cc34d68..0bcf1bc 100644
--- a/validate.tcl
+++ b/validate.tcl
@@ -42,3 +42,8 @@ if {![catch {package require Thread}]} {
     }
     puts "thread: $r"
 }
+
+# check pkgconfig
+tcl::pkgconfig list
+set wd [expr {[tcl::pkgconfig get 64bit] ? "64bit" : "32bit"}]
+puts "pkgconfig: $wd [tcl::pkgconfig get {bindir,runtime}]"
-- 
2.23.0