>Number:         12076
>Category:       xsrc
>Synopsis:       libXaw from X11 should use native wchar support
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    xsrc-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Mon Jan 29 01:38:00 PST 2001
>Closed-Date:
>Last-Modified:
>Originator:     Jaromír Dolecek
>Release:        1.5Q
>Organization:
	
>Environment:
	
System: NetBSD saruman.ics.muni.cz 1.5R NetBSD 1.5R (SARUMAN) #6: Mon Jan 29 09:35:19 CET 2001 dolecek@saruman.ics.muni.cz:/usr/home/dolecek/soft/netbsd/sys/arch/i386/compile/SARUMAN i386
Architecture: i386
Machine: i386
>Description:
	Current config/cf/NetBSD.cf makes Xaw to use X-supplied wchar
	stuff. Since we now have native support thanks to Citrus project,
	this should be changed to account for that.
	I've not looked at XFree86 4.0 subtree, but I assume
	it's same as for xsrc 3.3.
>How-To-Repeat:
	look at xsrc/xc/config/cf/NetBSD.cf
>Fix:
	Seems like this would be it (untested). This also should
	be fed to XFree86 for inclusion to official release.

--- NetBSD.cf	Mon Jan 29 10:11:59 2001
+++ NetBSD.cf.new	Mon Jan 29 10:33:53 2001
@@ -414,7 +414,15 @@
 #endif
 
 #define StandardDefines	-DCSRG_BASED
+
+/* Citrus mb locale were added in 1.5P */
+#if (OSMajorVersion > 1 || \
+    (OsMajorVersion == 1 && OsMinorVersion > 5) || \
+    (OsMajorVersion == 1 && OsMinorVersion == 5 && OsTeenyVersion >= 15))
+#define XawI18nDefines	-DHAS_WCHAR_H -DHAS_WCTYPE_H -DNO_WIDEC_H
+#else
 #define XawI18nDefines	-DUSE_XWCHAR_STRING -DUSE_XMBTOWC
+#endif
 
 #ifndef ExtraLibraries
 #define ExtraLibraries		/**/
>Release-Note:
>Audit-Trail:
>Unformatted: