--- configure-orig	2021-02-25 13:27:12.168220100 +0000
+++ configure	2021-02-25 13:30:53.244339541 +0000
@@ -7835,16 +7835,17 @@
 
 fi
 if test x$codesets = xall; then
-  codesets=jp,jp-ext,kr,zh,zh-ext
+  codesets=eu,vn,jp,jp-ext,kr,zh,zh-ext
 fi
 
 $as_echo "#define ENCODING_EU 1" >>confdefs.h
 
 
-$as_echo "#define ENCODING_VN 1" >>confdefs.h
-
 for codeset in `echo $codesets | tr "a-z,\\-" "A-Z _"`; do
   case "$codeset" in
+    VN     )
+$as_echo "#define ENCODING_VN 1" >>confdefs.h
+ ;;
     JP     )
 $as_echo "#define ENCODING_JP 1" >>confdefs.h
  ;;
--- src/xdefaults.C-orig	2021-02-25 13:23:38.765173963 +0000
+++ src/xdefaults.C	2021-02-25 13:24:16.810591863 +0000
@@ -317,7 +317,10 @@
 #if UNICODE_3
                                     "unicode3,"
 #endif
-                                    "encodings=eu+vn"
+                                    "encodings="
+#if ENCODING_EU
+                                    "+eu"
+#endif
+#if ENCODING_VN
+                                    "+vn"
+#endif
 #if ENCODING_JP
                                     "+jp"
 #endif