Index: unix/tclUnixInit.c
===================================================================
RCS file: /cvsroot/tcl/tcl/unix/tclUnixInit.c,v
retrieving revision 1.34.2.7
diff -u -r1.34.2.7 tclUnixInit.c
--- unix/tclUnixInit.c	14 May 2005 20:52:33 -0000	1.34.2.7
+++ unix/tclUnixInit.c	19 May 2005 20:42:26 -0000
@@ -490,7 +490,6 @@
 void
 TclpSetInitialEncodings()
 {
-    if (libraryPathEncodingFixed == 0) {
 	CONST char *encoding = NULL;
 	int i, setSysEncCode = TCL_ERROR;
 	Tcl_Obj *pathPtr;
@@ -654,6 +653,8 @@
 
 	setlocale(LC_NUMERIC, "C");
 
+    if ((libraryPathEncodingFixed == 0) && strcmp("identity",
+	    Tcl_GetEncodingName(Tcl_GetEncoding(NULL, NULL))) ) {
 	/*
 	 * Until the system encoding was actually set, the library path was
 	 * actually in the native multi-byte encoding, and not really UTF-8
