X Strike Force X.Org X11 SVN commit: r3714 - in trunk/lib/libx11: . debian debian/patches include man modules modules/im modules/im/ximcp modules/lc modules/lc/Utf8 modules/lc/def modules/lc/gen modules/lc/xlocale modules/om modules/om/generic nls nls/C nls/armscii-8 nls/el_GR.UTF-8 nls/en_US.UTF-8 nls/georgian-academy nls/georgian-ps nls/ibm-cp1133 nls/iscii-dev nls/isiri-3342 nls/iso8859-1 nls/iso8859-10 nls/iso8859-11 nls/iso8859-13 nls/iso8859-14 nls/iso8859-15 nls/iso8859-2 nls/iso8859-3 nls/iso8859-4 nls/iso8859-5 nls/iso8859-6 nls/iso8859-7 nls/iso8859-8 nls/iso8859-9 nls/iso8859-9e nls/ja nls/ja.JIS nls/ja.S90 nls/ja.SJIS nls/ja.U90 nls/ja_JP.UTF-8 nls/ko nls/ko_KR.UTF-8 nls/koi8-c nls/koi8-r nls/koi8-u nls/microsoft-cp1251 nls/microsoft-cp1255 nls/microsoft-cp1256 nls/mulelao-1 nls/nokhchi-1 nls/pt_BR.UTF-8 nls/ru_RU.UTF-8 nls/tatar-cyr nls/th_TH nls/th_TH.UTF-8 nls/tscii-0 nls/vi_VN.tcvn nls/vi_VN.viscii nls/zh_CN nls/zh_CN.UTF-8 nls/zh_CN.gb18030 nls/zh_CN.gbk nls/zh_HK.UTF-8 nls/zh_HK.big5 nls/zh_HK.big5hkscs nls/zh_TW nls/zh_TW.UTF-8 nls/zh_TW.big5 src src/util src/xcms src/xkb src/xlibi18n

To: debian-x@lists.debian.org
Subject: X Strike Force X.Org X11 SVN commit: r3714 - in trunk/lib/libx11: . debian debian/patches include man modules modules/im modules/im/ximcp modules/lc modules/lc/Utf8 modules/lc/def modules/lc/gen modules/lc/xlocale modules/om modules/om/generic nls nls/C nls/armscii-8 nls/el_GR.UTF-8 nls/en_US.UTF-8 nls/georgian-academy nls/georgian-ps nls/ibm-cp1133 nls/iscii-dev nls/isiri-3342 nls/iso8859-1 nls/iso8859-10 nls/iso8859-11 nls/iso8859-13 nls/iso8859-14 nls/iso8859-15 nls/iso8859-2 nls/iso8859-3 nls/iso8859-4 nls/iso8859-5 nls/iso8859-6 nls/iso8859-7 nls/iso8859-8 nls/iso8859-9 nls/iso8859-9e nls/ja nls/ja.JIS nls/ja.S90 nls/ja.SJIS nls/ja.U90 nls/ja_JP.UTF-8 nls/ko nls/ko_KR.UTF-8 nls/koi8-c nls/koi8-r nls/koi8-u nls/microsoft-cp1251 nls/microsoft-cp1255 nls/microsoft-cp1256 nls/mulelao-1 nls/nokhchi-1 nls/pt_BR.UTF-8 nls/ru_RU.UTF-8 nls/tatar-cyr nls/th_TH nls/th_TH.UTF-8 nls/tscii-0 nls/vi_VN.tcvn nls/vi_VN.viscii nls/zh_CN nls/zh_CN.UTF-8 nls/zh_CN.gb18030 nls/zh_CN.gbk nls/zh_HK.UTF-8 nls/zh_HK.big5 nls/zh_HK.big5hkscs nls/zh_TW nls/zh_TW.UTF-8 nls/zh_TW.big5 src src/util src/xcms src/xkb src/xlibi18n
From: X Strike Force SVN Repository Admin <branden+svnadmin@deadbeast.net>
Date: Tue, 10 Oct 2006 21:00:16 -0400 (EDT)
Message-id: <[🔎] 20061011010016.16B805C05B@necrotic.deadbeast.net>
Mail-followup-to: debian-x@lists.debian.org
Author: dnusinow
Date: 2006-10-10 21:00:10 -0400 (Tue, 10 Oct 2006)
New Revision: 3714

Added:
   trunk/lib/libx11/debian/patches/018_nonlinux.diff
   trunk/lib/libx11/debian/patches/019_new_autoconf.diff
Modified:
   trunk/lib/libx11/Makefile.in
   trunk/lib/libx11/configure
   trunk/lib/libx11/debian/changelog
   trunk/lib/libx11/debian/patches/series
   trunk/lib/libx11/include/Makefile.in
   trunk/lib/libx11/man/Makefile.in
   trunk/lib/libx11/modules/Makefile.in
   trunk/lib/libx11/modules/im/Makefile.in
   trunk/lib/libx11/modules/im/ximcp/Makefile.in
   trunk/lib/libx11/modules/lc/Makefile.in
   trunk/lib/libx11/modules/lc/Utf8/Makefile.in
   trunk/lib/libx11/modules/lc/def/Makefile.in
   trunk/lib/libx11/modules/lc/gen/Makefile.in
   trunk/lib/libx11/modules/lc/xlocale/Makefile.in
   trunk/lib/libx11/modules/om/Makefile.in
   trunk/lib/libx11/modules/om/generic/Makefile.in
   trunk/lib/libx11/nls/C/Makefile.in
   trunk/lib/libx11/nls/Makefile.in
   trunk/lib/libx11/nls/armscii-8/Makefile.in
   trunk/lib/libx11/nls/el_GR.UTF-8/Makefile.in
   trunk/lib/libx11/nls/en_US.UTF-8/Makefile.in
   trunk/lib/libx11/nls/georgian-academy/Makefile.in
   trunk/lib/libx11/nls/georgian-ps/Makefile.in
   trunk/lib/libx11/nls/ibm-cp1133/Makefile.in
   trunk/lib/libx11/nls/iscii-dev/Makefile.in
   trunk/lib/libx11/nls/isiri-3342/Makefile.in
   trunk/lib/libx11/nls/iso8859-1/Makefile.in
   trunk/lib/libx11/nls/iso8859-10/Makefile.in
   trunk/lib/libx11/nls/iso8859-11/Makefile.in
   trunk/lib/libx11/nls/iso8859-13/Makefile.in
   trunk/lib/libx11/nls/iso8859-14/Makefile.in
   trunk/lib/libx11/nls/iso8859-15/Makefile.in
   trunk/lib/libx11/nls/iso8859-2/Makefile.in
   trunk/lib/libx11/nls/iso8859-3/Makefile.in
   trunk/lib/libx11/nls/iso8859-4/Makefile.in
   trunk/lib/libx11/nls/iso8859-5/Makefile.in
   trunk/lib/libx11/nls/iso8859-6/Makefile.in
   trunk/lib/libx11/nls/iso8859-7/Makefile.in
   trunk/lib/libx11/nls/iso8859-8/Makefile.in
   trunk/lib/libx11/nls/iso8859-9/Makefile.in
   trunk/lib/libx11/nls/iso8859-9e/Makefile.in
   trunk/lib/libx11/nls/ja.JIS/Makefile.in
   trunk/lib/libx11/nls/ja.S90/Makefile.in
   trunk/lib/libx11/nls/ja.SJIS/Makefile.in
   trunk/lib/libx11/nls/ja.U90/Makefile.in
   trunk/lib/libx11/nls/ja/Makefile.in
   trunk/lib/libx11/nls/ja_JP.UTF-8/Makefile.in
   trunk/lib/libx11/nls/ko/Makefile.in
   trunk/lib/libx11/nls/ko_KR.UTF-8/Makefile.in
   trunk/lib/libx11/nls/koi8-c/Makefile.in
   trunk/lib/libx11/nls/koi8-r/Makefile.in
   trunk/lib/libx11/nls/koi8-u/Makefile.in
   trunk/lib/libx11/nls/microsoft-cp1251/Makefile.in
   trunk/lib/libx11/nls/microsoft-cp1255/Makefile.in
   trunk/lib/libx11/nls/microsoft-cp1256/Makefile.in
   trunk/lib/libx11/nls/mulelao-1/Makefile.in
   trunk/lib/libx11/nls/nokhchi-1/Makefile.in
   trunk/lib/libx11/nls/pt_BR.UTF-8/Makefile.in
   trunk/lib/libx11/nls/ru_RU.UTF-8/Makefile.in
   trunk/lib/libx11/nls/tatar-cyr/Makefile.in
   trunk/lib/libx11/nls/th_TH.UTF-8/Makefile.in
   trunk/lib/libx11/nls/th_TH/Makefile.in
   trunk/lib/libx11/nls/tscii-0/Makefile.in
   trunk/lib/libx11/nls/vi_VN.tcvn/Makefile.in
   trunk/lib/libx11/nls/vi_VN.viscii/Makefile.in
   trunk/lib/libx11/nls/zh_CN.UTF-8/Makefile.in
   trunk/lib/libx11/nls/zh_CN.gb18030/Makefile.in
   trunk/lib/libx11/nls/zh_CN.gbk/Makefile.in
   trunk/lib/libx11/nls/zh_CN/Makefile.in
   trunk/lib/libx11/nls/zh_HK.UTF-8/Makefile.in
   trunk/lib/libx11/nls/zh_HK.big5/Makefile.in
   trunk/lib/libx11/nls/zh_HK.big5hkscs/Makefile.in
   trunk/lib/libx11/nls/zh_TW.UTF-8/Makefile.in
   trunk/lib/libx11/nls/zh_TW.big5/Makefile.in
   trunk/lib/libx11/nls/zh_TW/Makefile.in
   trunk/lib/libx11/src/Makefile.in
   trunk/lib/libx11/src/config.h.in
   trunk/lib/libx11/src/util/Makefile.in
   trunk/lib/libx11/src/xcms/Makefile.in
   trunk/lib/libx11/src/xkb/Makefile.in
   trunk/lib/libx11/src/xlibi18n/Makefile.in
Log:
Mergy merge.

Modified: trunk/lib/libx11/Makefile.in
===================================================================
--- trunk/lib/libx11/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -127,6 +127,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -141,6 +142,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/configure
===================================================================
--- trunk/lib/libx11/configure	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/configure	2006-10-11 01:00:10 UTC (rev 3714)
@@ -905,12 +905,14 @@
 XKBPROTO_REQUIRES
 X11_DATADIR
 X11_LIBDIR
+XLOCALEDATADIR
 X11_LOCALEDATADIR
+XLOCALELIBDIR
 X11_LOCALELIBDIR
+XLOCALEDIR
+X11_LOCALEDIR
 XKEYSYMDB
 XERRORDB
-XLOCALEDIR
-XLOCALELIBDIR
 MALLOC_ZERO_CFLAGS
 XMALLOC_ZERO_CFLAGS
 XTMALLOC_ZERO_CFLAGS
@@ -4436,7 +4438,11 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
+<<<<<<< .working
   echo '#line 4439 "configure"' > conftest.$ac_ext
+=======
+  echo '#line 4503 "configure"' > conftest.$ac_ext
+>>>>>>> .merge-right.r3691
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7393,11 +7399,19 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
+<<<<<<< .working
    (eval echo "\"\$as_me:7396: $lt_compile\"" >&5)
+=======
+   (eval echo "\"\$as_me:7467: $lt_compile\"" >&5)
+>>>>>>> .merge-right.r3691
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
+<<<<<<< .working
    echo "$as_me:7400: \$? = $ac_status" >&5
+=======
+   echo "$as_me:7471: \$? = $ac_status" >&5
+>>>>>>> .merge-right.r3691
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7661,11 +7675,19 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
+<<<<<<< .working
    (eval echo "\"\$as_me:7664: $lt_compile\"" >&5)
+=======
+   (eval echo "\"\$as_me:7735: $lt_compile\"" >&5)
+>>>>>>> .merge-right.r3691
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
+<<<<<<< .working
    echo "$as_me:7668: \$? = $ac_status" >&5
+=======
+   echo "$as_me:7739: \$? = $ac_status" >&5
+>>>>>>> .merge-right.r3691
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7765,11 +7787,19 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
+<<<<<<< .working
    (eval echo "\"\$as_me:7768: $lt_compile\"" >&5)
+=======
+   (eval echo "\"\$as_me:7839: $lt_compile\"" >&5)
+>>>>>>> .merge-right.r3691
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
+<<<<<<< .working
    echo "$as_me:7772: \$? = $ac_status" >&5
+=======
+   echo "$as_me:7843: \$? = $ac_status" >&5
+>>>>>>> .merge-right.r3691
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -10206,7 +10236,11 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
+<<<<<<< .working
 #line 10209 "configure"
+=======
+#line 10280 "configure"
+>>>>>>> .merge-right.r3691
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10306,7 +10340,11 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
+<<<<<<< .working
 #line 10309 "configure"
+=======
+#line 10380 "configure"
+>>>>>>> .merge-right.r3691
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12674,11 +12712,19 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
+<<<<<<< .working
    (eval echo "\"\$as_me:12677: $lt_compile\"" >&5)
+=======
+   (eval echo "\"\$as_me:12748: $lt_compile\"" >&5)
+>>>>>>> .merge-right.r3691
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
+<<<<<<< .working
    echo "$as_me:12681: \$? = $ac_status" >&5
+=======
+   echo "$as_me:12752: \$? = $ac_status" >&5
+>>>>>>> .merge-right.r3691
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -12778,11 +12824,19 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
+<<<<<<< .working
    (eval echo "\"\$as_me:12781: $lt_compile\"" >&5)
+=======
+   (eval echo "\"\$as_me:12852: $lt_compile\"" >&5)
+>>>>>>> .merge-right.r3691
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
+<<<<<<< .working
    echo "$as_me:12785: \$? = $ac_status" >&5
+=======
+   echo "$as_me:12856: \$? = $ac_status" >&5
+>>>>>>> .merge-right.r3691
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -14339,11 +14393,19 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
+<<<<<<< .working
    (eval echo "\"\$as_me:14342: $lt_compile\"" >&5)
+=======
+   (eval echo "\"\$as_me:14413: $lt_compile\"" >&5)
+>>>>>>> .merge-right.r3691
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
+<<<<<<< .working
    echo "$as_me:14346: \$? = $ac_status" >&5
+=======
+   echo "$as_me:14417: \$? = $ac_status" >&5
+>>>>>>> .merge-right.r3691
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -14443,11 +14505,19 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
+<<<<<<< .working
    (eval echo "\"\$as_me:14446: $lt_compile\"" >&5)
+=======
+   (eval echo "\"\$as_me:14517: $lt_compile\"" >&5)
+>>>>>>> .merge-right.r3691
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
+<<<<<<< .working
    echo "$as_me:14450: \$? = $ac_status" >&5
+=======
+   echo "$as_me:14521: \$? = $ac_status" >&5
+>>>>>>> .merge-right.r3691
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -16662,11 +16732,19 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
+<<<<<<< .working
    (eval echo "\"\$as_me:16665: $lt_compile\"" >&5)
+=======
+   (eval echo "\"\$as_me:16736: $lt_compile\"" >&5)
+>>>>>>> .merge-right.r3691
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
+<<<<<<< .working
    echo "$as_me:16669: \$? = $ac_status" >&5
+=======
+   echo "$as_me:16740: \$? = $ac_status" >&5
+>>>>>>> .merge-right.r3691
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16930,11 +17008,19 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
+<<<<<<< .working
    (eval echo "\"\$as_me:16933: $lt_compile\"" >&5)
+=======
+   (eval echo "\"\$as_me:17004: $lt_compile\"" >&5)
+>>>>>>> .merge-right.r3691
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
+<<<<<<< .working
    echo "$as_me:16937: \$? = $ac_status" >&5
+=======
+   echo "$as_me:17008: \$? = $ac_status" >&5
+>>>>>>> .merge-right.r3691
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -17034,11 +17120,19 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
+<<<<<<< .working
    (eval echo "\"\$as_me:17037: $lt_compile\"" >&5)
+=======
+   (eval echo "\"\$as_me:17108: $lt_compile\"" >&5)
+>>>>>>> .merge-right.r3691
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
+<<<<<<< .working
    echo "$as_me:17041: \$? = $ac_status" >&5
+=======
+   echo "$as_me:17112: \$? = $ac_status" >&5
+>>>>>>> .merge-right.r3691
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -24645,8 +24739,45 @@
 fi
 
 X11_DATADIR="${datadir}/X11"
+
+  prefix_NONE=
+  exec_prefix_NONE=
+  test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
+  test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
+  eval ac_define_dir="\"$X11_DATADIR\""
+  eval ac_define_dir="\"$ac_define_dir\""
+  X11_DATADIR="$ac_define_dir"
+
+
+cat >>confdefs.h <<_ACEOF
+#define X11_DATADIR "$ac_define_dir"
+_ACEOF
+
+  test "$prefix_NONE" && prefix=NONE
+  test "$exec_prefix_NONE" && exec_prefix=NONE
+
+
+
 X11_LIBDIR="${libdir}/X11"
 
+  prefix_NONE=
+  exec_prefix_NONE=
+  test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
+  test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
+  eval ac_define_dir="\"$X11_LIBDIR\""
+  eval ac_define_dir="\"$ac_define_dir\""
+  X11_LIBDIR="$ac_define_dir"
+
+
+cat >>confdefs.h <<_ACEOF
+#define X11_LIBDIR "$ac_define_dir"
+_ACEOF
+
+  test "$prefix_NONE" && prefix=NONE
+  test "$exec_prefix_NONE" && exec_prefix=NONE
+
+
+
 X11_CFLAGS="$X11_CFLAGS $XPROTO_CFLAGS"
 
 
@@ -24660,90 +24791,97 @@
 #
 
 X11_LOCALEDATADIR="${X11_DATADIR}/locale"
-X11_LOCALELIBDIR="${X11_LIBDIR}/locale"
-X11_LOCALEDIR="${X11_LOCALEDATADIR}"
-XKEYSYMDB="${X11_DATADIR}/XKeysymDB"
-XERRORDB="${X11_DATADIR}/XErrorDB"
 
-
-
-
-
-
   prefix_NONE=
   exec_prefix_NONE=
   test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
   test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
-  eval ac_define_dir="\"$X11_DATADIR\""
-  X11_DATADIR="$ac_define_dir"
+  eval ac_define_dir="\"$X11_LOCALEDATADIR\""
+  eval ac_define_dir="\"$ac_define_dir\""
+  XLOCALEDATADIR="$ac_define_dir"
 
 
 cat >>confdefs.h <<_ACEOF
-#define X11_DATADIR "$ac_define_dir"
+#define XLOCALEDATADIR "$ac_define_dir"
 _ACEOF
 
   test "$prefix_NONE" && prefix=NONE
   test "$exec_prefix_NONE" && exec_prefix=NONE
 
 
+
+X11_LOCALELIBDIR="${X11_LIBDIR}/locale"
+
   prefix_NONE=
   exec_prefix_NONE=
   test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
   test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
-  eval ac_define_dir="\"$XKEYSYMDB\""
-  XKEYSYMDB="$ac_define_dir"
+  eval ac_define_dir="\"$X11_LOCALELIBDIR\""
+  eval ac_define_dir="\"$ac_define_dir\""
+  XLOCALELIBDIR="$ac_define_dir"
 
 
 cat >>confdefs.h <<_ACEOF
-#define XKEYSYMDB "$ac_define_dir"
+#define XLOCALELIBDIR "$ac_define_dir"
 _ACEOF
 
   test "$prefix_NONE" && prefix=NONE
   test "$exec_prefix_NONE" && exec_prefix=NONE
 
 
+
+X11_LOCALEDIR="${X11_LOCALEDATADIR}"
+
   prefix_NONE=
   exec_prefix_NONE=
   test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
   test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
-  eval ac_define_dir="\"$XERRORDB\""
-  XERRORDB="$ac_define_dir"
+  eval ac_define_dir="\"$X11_LOCALEDIR\""
+  eval ac_define_dir="\"$ac_define_dir\""
+  XLOCALEDIR="$ac_define_dir"
 
 
 cat >>confdefs.h <<_ACEOF
-#define XERRORDB "$ac_define_dir"
+#define XLOCALEDIR "$ac_define_dir"
 _ACEOF
 
   test "$prefix_NONE" && prefix=NONE
   test "$exec_prefix_NONE" && exec_prefix=NONE
 
 
+
+XKEYSYMDB="${X11_DATADIR}/XKeysymDB"
+
   prefix_NONE=
   exec_prefix_NONE=
   test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
   test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
-  eval ac_define_dir="\"$X11_LOCALEDIR\""
-  XLOCALEDIR="$ac_define_dir"
+  eval ac_define_dir="\"$XKEYSYMDB\""
+  eval ac_define_dir="\"$ac_define_dir\""
+  XKEYSYMDB="$ac_define_dir"
 
 
 cat >>confdefs.h <<_ACEOF
-#define XLOCALEDIR "$ac_define_dir"
+#define XKEYSYMDB "$ac_define_dir"
 _ACEOF
 
   test "$prefix_NONE" && prefix=NONE
   test "$exec_prefix_NONE" && exec_prefix=NONE
 
 
+XERRORDB="${X11_DATADIR}/XErrorDB"
+
   prefix_NONE=
   exec_prefix_NONE=
   test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
   test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
-  eval ac_define_dir="\"$X11_LOCALELIBDIR\""
-  XLOCALELIBDIR="$ac_define_dir"
+  eval ac_define_dir="\"$XERRORDB\""
+  eval ac_define_dir="\"$ac_define_dir\""
+  XERRORDB="$ac_define_dir"
 
 
 cat >>confdefs.h <<_ACEOF
-#define XLOCALELIBDIR "$ac_define_dir"
+#define XERRORDB "$ac_define_dir"
 _ACEOF
 
   test "$prefix_NONE" && prefix=NONE
@@ -24751,6 +24889,7 @@
 
 
 
+
 # Check whether --enable-malloc0returnsnull was given.
 if test "${enable_malloc0returnsnull+set}" = set; then
   enableval=$enable_malloc0returnsnull; MALLOC_ZERO_RETURNS_NULL=$enableval
@@ -25828,12 +25967,14 @@
 XKBPROTO_REQUIRES!$XKBPROTO_REQUIRES$ac_delim
 X11_DATADIR!$X11_DATADIR$ac_delim
 X11_LIBDIR!$X11_LIBDIR$ac_delim
+XLOCALEDATADIR!$XLOCALEDATADIR$ac_delim
 X11_LOCALEDATADIR!$X11_LOCALEDATADIR$ac_delim
+XLOCALELIBDIR!$XLOCALELIBDIR$ac_delim
 X11_LOCALELIBDIR!$X11_LOCALELIBDIR$ac_delim
+XLOCALEDIR!$XLOCALEDIR$ac_delim
+X11_LOCALEDIR!$X11_LOCALEDIR$ac_delim
 XKEYSYMDB!$XKEYSYMDB$ac_delim
 XERRORDB!$XERRORDB$ac_delim
-XLOCALEDIR!$XLOCALEDIR$ac_delim
-XLOCALELIBDIR!$XLOCALELIBDIR$ac_delim
 MALLOC_ZERO_CFLAGS!$MALLOC_ZERO_CFLAGS$ac_delim
 XMALLOC_ZERO_CFLAGS!$XMALLOC_ZERO_CFLAGS$ac_delim
 XTMALLOC_ZERO_CFLAGS!$XTMALLOC_ZERO_CFLAGS$ac_delim
@@ -25841,7 +25982,11 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
+<<<<<<< .working
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 65; then
+=======
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 72; then
+>>>>>>> .merge-right.r3691
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

Modified: trunk/lib/libx11/debian/changelog
===================================================================
--- trunk/lib/libx11/debian/changelog	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/debian/changelog	2006-10-11 01:00:10 UTC (rev 3714)
@@ -6,6 +6,11 @@
   * Run dh_install with --list-missing
   * Remove obsolete patch 011
   * Bump debhelper compat to 5
+  * Add 18_nonlinux.diff to fix building in gnu environments. Thanks Samuel
+    Thibault, Robert Millan, and Michael Banck. Closes: #358708
+  * Add 019_new_autoconf.diff to allow us to not break the server in
+    horrendous ways using newer versions of autoconf. Thanks to Jamey Sharp
+    for pointing this patch out in upstream HEAD.
 
   [ Denis Barbier ]
   * Sync patches:
@@ -13,6 +18,11 @@
     - 005_Compose_fix_latin1_UTF8.diff
     - 006_tailor_pt_BR.UTF-8_Compose.diff
     - 014_add_Khmer_digraphs.diff
+  * Add 014_add_Khmer_digraphs.diff.  Khmer keyboards have to generate
+    several characters with a single keystroke, so define them in
+    en_US.UTF-8/Compose.  They will be added later to all UTF-8 files.
+    Thanks Paul Wise.  (closes: #355957)
+  * Add support for Khmer locale in 003_recognize_glibc_2.3.2_locale_names.diff
 
   [ Andres Salomon ]
   * Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build;
@@ -23,6 +33,27 @@
 
  -- Drew Parsons <dparsons@debian.org>  Sat, 19 Aug 2006 22:22:01 +1000
 
+libx11 (2:1.0.0-9) unstable; urgency=low
+
+  * Add 015_russian_locale_alias.diff.  Locale alias for russian was incorrect,
+    it should be ru_RU.KOI8-R as in glibc locale.alias.  Thanks Andrei Lahun.
+    (closes: #368655)
+  * Add 016_greek_polytonic_Compose.diff.  Add compose sequences with the
+    right breathing signs U0313/U0314 to el_GR.UTF-8/Compose.
+    Thanks Jan Willem Stumpel.  (closes: #386471)
+  * Add 017_FTBFS_makekeys.diff.  Fix a FTBFS when compiling with
+    x11proto-core-dev >= 7.0.3, backported from upstream.
+    Thanks Goswin von Brederlow.  (closes: #387133)
+
+ -- Denis Barbier <barbier@debian.org>  Thu, 14 Sep 2006 01:35:19 +0200
+
+libx11 (2:1.0.0-8) unstable; urgency=low
+
+  * Add 18_nonlinux.diff to fix building in gnu environments. Thanks Samuel
+    Thibault, Robert Millan, and Michael Banck. Closes: #358708
+
+ -- David Nusinow <dnusinow@debian.org>  Wed, 27 Sep 2006 21:07:10 -0400
+
 libx11 (2:1.0.0-7) unstable; urgency=high
 
   * Security update. Fix for setuid privledge escalation vulernabilities.

Copied: trunk/lib/libx11/debian/patches/018_nonlinux.diff (from rev 3532, trunk/lib/libx11/debian/patches/018_nonlinux.diff)
===================================================================
--- trunk/lib/libx11/debian/patches/018_nonlinux.diff	                        (rev 0)
+++ trunk/lib/libx11/debian/patches/018_nonlinux.diff	2006-10-11 01:00:10 UTC (rev 3714)
@@ -0,0 +1,13 @@
+Index: libx11/configure.ac
+===================================================================
+--- libx11.orig/configure.ac	2006-09-27 21:06:37.000000000 -0400
++++ libx11/configure.ac	2006-09-27 21:06:52.000000000 -0400
+@@ -157,7 +157,7 @@
+ dnl XXX incomplete, please fill this in
+ if test x$xthreads = xyes ; then
+     case $host_os in
+-    linux*|openbsd*)
++    linux*|openbsd*|gnu*)
+         XTHREADLIB=-lpthread ;;
+     freebsd*)
+         XTHREAD_CFLAGS="-D_THREAD_SAFE"

Copied: trunk/lib/libx11/debian/patches/019_new_autoconf.diff (from rev 3691, trunk/lib/libx11/debian/patches/019_new_autoconf.diff)
===================================================================
--- trunk/lib/libx11/debian/patches/019_new_autoconf.diff	                        (rev 0)
+++ trunk/lib/libx11/debian/patches/019_new_autoconf.diff	2006-10-11 01:00:10 UTC (rev 3714)
@@ -0,0 +1,65 @@
+Index: libx11/acinclude.m4
+===================================================================
+--- libx11.orig/acinclude.m4	2006-08-02 18:55:53.000000000 -0400
++++ libx11/acinclude.m4	2006-10-09 12:28:05.000000000 -0400
+@@ -4,7 +4,10 @@
+   exec_prefix_NONE=
+   test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
+   test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
++dnl In Autoconf 2.60, ${datadir} refers to ${datarootdir}, which in turn
++dnl refers to ${prefix}.  Thus we have to use `eval' twice.
+   eval ac_define_dir="\"[$]$2\""
++  eval ac_define_dir="\"$ac_define_dir\""
+   AC_SUBST($1, "$ac_define_dir")
+   AC_DEFINE_UNQUOTED($1, "$ac_define_dir", [$3])
+   test "$prefix_NONE" && prefix=NONE
+Index: libx11/configure.ac
+===================================================================
+--- libx11.orig/configure.ac	2006-10-09 12:27:48.000000000 -0400
++++ libx11/configure.ac	2006-10-09 12:28:05.000000000 -0400
+@@ -298,7 +298,12 @@
+ fi
+ 
+ X11_DATADIR="${datadir}/X11"
++AC_DEFINE_DIR(X11_DATADIR, X11_DATADIR, [Location of libX11 data])
++AC_SUBST(X11_DATADIR)
++
+ X11_LIBDIR="${libdir}/X11"
++AC_DEFINE_DIR(X11_LIBDIR, X11_LIBDIR, [Location of libX11 library data])
++AC_SUBST(X11_LIBDIR)
+ 
+ X11_CFLAGS="$X11_CFLAGS $XPROTO_CFLAGS"
+ AC_SUBST(X11_CFLAGS)
+@@ -313,20 +318,23 @@
+ #
+ 
+ X11_LOCALEDATADIR="${X11_DATADIR}/locale"
++AC_DEFINE_DIR(XLOCALEDATADIR, X11_LOCALEDATADIR, [Location of libX11 locale data])
++AC_SUBST(X11_LOCALEDATADIR)
++
+ X11_LOCALELIBDIR="${X11_LIBDIR}/locale"
++AC_DEFINE_DIR(XLOCALELIBDIR, X11_LOCALELIBDIR, [Location of libX11 locale libraries])
++AC_SUBST(X11_LOCALELIBDIR)
++
+ X11_LOCALEDIR="${X11_LOCALEDATADIR}"
+-XKEYSYMDB="${X11_DATADIR}/XKeysymDB"
+-XERRORDB="${X11_DATADIR}/XErrorDB"
++AC_DEFINE_DIR(XLOCALEDIR, X11_LOCALEDIR, [Location of libX11 locale data])
++AC_SUBST(X11_LOCALEDIR)
+ 
+-AC_SUBST(X11_DATADIR)
+-AC_SUBST(X11_LIBDIR)
+-AC_SUBST(X11_LOCALEDATADIR)
+-AC_SUBST(X11_LOCALELIBDIR)
+-AC_DEFINE_DIR(X11_DATADIR, X11_DATADIR, [Location of libX11 data])
++XKEYSYMDB="${X11_DATADIR}/XKeysymDB"
+ AC_DEFINE_DIR(XKEYSYMDB, XKEYSYMDB, [Location of keysym database])
++
++XERRORDB="${X11_DATADIR}/XErrorDB"
+ AC_DEFINE_DIR(XERRORDB, XERRORDB, [Location of error message database])
+-AC_DEFINE_DIR(XLOCALEDIR, X11_LOCALEDIR, [Location of libX11 locale data])
+-AC_DEFINE_DIR(XLOCALELIBDIR, X11_LOCALELIBDIR, [Location of libX11 locale libraries])
++
+ 
+ XORG_CHECK_MALLOC_ZERO
+ XORG_RELEASE_VERSION

Modified: trunk/lib/libx11/debian/patches/series
===================================================================
--- trunk/lib/libx11/debian/patches/series	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/debian/patches/series	2006-10-11 01:00:10 UTC (rev 3714)
@@ -9,3 +9,8 @@
 009_iso8859-15_Compose_Eurosign.diff
 012_ru_RU_UTF-8_XLC_LOCALE.diff
 014_add_Khmer_digraphs.diff
+015_russian_locale_alias.diff
+016_greek_polytonic_Compose.diff
+017_FTBFS_makekeys.diff
+018_nonlinux.diff
+019_new_autoconf.diff

Modified: trunk/lib/libx11/include/Makefile.in
===================================================================
--- trunk/lib/libx11/include/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/include/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -127,6 +127,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -141,6 +142,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/man/Makefile.in
===================================================================
--- trunk/lib/libx11/man/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/man/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -134,6 +134,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -148,6 +149,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/modules/Makefile.in
===================================================================
--- trunk/lib/libx11/modules/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/modules/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -127,6 +127,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -141,6 +142,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/modules/im/Makefile.in
===================================================================
--- trunk/lib/libx11/modules/im/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/modules/im/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -127,6 +127,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -141,6 +142,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/modules/im/ximcp/Makefile.in
===================================================================
--- trunk/lib/libx11/modules/im/ximcp/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/modules/im/ximcp/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -127,6 +127,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -141,6 +142,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/modules/lc/Makefile.in
===================================================================
--- trunk/lib/libx11/modules/lc/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/modules/lc/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -127,6 +127,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -141,6 +142,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/modules/lc/Utf8/Makefile.in
===================================================================
--- trunk/lib/libx11/modules/lc/Utf8/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/modules/lc/Utf8/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -127,6 +127,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -141,6 +142,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/modules/lc/def/Makefile.in
===================================================================
--- trunk/lib/libx11/modules/lc/def/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/modules/lc/def/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -127,6 +127,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -141,6 +142,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/modules/lc/gen/Makefile.in
===================================================================
--- trunk/lib/libx11/modules/lc/gen/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/modules/lc/gen/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -127,6 +127,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -141,6 +142,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/modules/lc/xlocale/Makefile.in
===================================================================
--- trunk/lib/libx11/modules/lc/xlocale/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/modules/lc/xlocale/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -127,6 +127,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -141,6 +142,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/modules/om/Makefile.in
===================================================================
--- trunk/lib/libx11/modules/om/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/modules/om/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -127,6 +127,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -141,6 +142,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/modules/om/generic/Makefile.in
===================================================================
--- trunk/lib/libx11/modules/om/generic/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/modules/om/generic/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -127,6 +127,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -141,6 +142,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/C/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/C/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/C/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/armscii-8/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/armscii-8/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/armscii-8/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/el_GR.UTF-8/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/el_GR.UTF-8/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/el_GR.UTF-8/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/en_US.UTF-8/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/en_US.UTF-8/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/en_US.UTF-8/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/georgian-academy/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/georgian-academy/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/georgian-academy/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/georgian-ps/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/georgian-ps/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/georgian-ps/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/ibm-cp1133/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/ibm-cp1133/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/ibm-cp1133/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/iscii-dev/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/iscii-dev/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/iscii-dev/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/isiri-3342/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/isiri-3342/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/isiri-3342/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/iso8859-1/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/iso8859-1/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/iso8859-1/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/iso8859-10/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/iso8859-10/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/iso8859-10/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/iso8859-11/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/iso8859-11/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/iso8859-11/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/iso8859-13/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/iso8859-13/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/iso8859-13/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/iso8859-14/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/iso8859-14/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/iso8859-14/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/iso8859-15/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/iso8859-15/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/iso8859-15/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/iso8859-2/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/iso8859-2/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/iso8859-2/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/iso8859-3/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/iso8859-3/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/iso8859-3/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/iso8859-4/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/iso8859-4/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/iso8859-4/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/iso8859-5/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/iso8859-5/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/iso8859-5/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/iso8859-6/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/iso8859-6/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/iso8859-6/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/iso8859-7/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/iso8859-7/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/iso8859-7/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/iso8859-8/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/iso8859-8/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/iso8859-8/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/iso8859-9/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/iso8859-9/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/iso8859-9/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/iso8859-9e/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/iso8859-9e/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/iso8859-9e/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/ja/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/ja/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/ja/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/ja.JIS/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/ja.JIS/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/ja.JIS/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/ja.S90/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/ja.S90/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/ja.S90/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/ja.SJIS/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/ja.SJIS/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/ja.SJIS/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/ja.U90/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/ja.U90/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/ja.U90/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/ja_JP.UTF-8/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/ja_JP.UTF-8/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/ja_JP.UTF-8/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/ko/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/ko/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/ko/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/ko_KR.UTF-8/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/ko_KR.UTF-8/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/ko_KR.UTF-8/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/koi8-c/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/koi8-c/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/koi8-c/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/koi8-r/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/koi8-r/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/koi8-r/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/koi8-u/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/koi8-u/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/koi8-u/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/microsoft-cp1251/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/microsoft-cp1251/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/microsoft-cp1251/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/microsoft-cp1255/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/microsoft-cp1255/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/microsoft-cp1255/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/microsoft-cp1256/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/microsoft-cp1256/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/microsoft-cp1256/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/mulelao-1/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/mulelao-1/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/mulelao-1/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/nokhchi-1/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/nokhchi-1/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/nokhchi-1/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/pt_BR.UTF-8/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/pt_BR.UTF-8/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/pt_BR.UTF-8/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/ru_RU.UTF-8/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/ru_RU.UTF-8/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/ru_RU.UTF-8/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/tatar-cyr/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/tatar-cyr/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/tatar-cyr/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/th_TH/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/th_TH/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/th_TH/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/th_TH.UTF-8/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/th_TH.UTF-8/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/th_TH.UTF-8/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/tscii-0/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/tscii-0/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/tscii-0/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/vi_VN.tcvn/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/vi_VN.tcvn/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/vi_VN.tcvn/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/vi_VN.viscii/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/vi_VN.viscii/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/vi_VN.viscii/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/zh_CN/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/zh_CN/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/zh_CN/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/zh_CN.UTF-8/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/zh_CN.UTF-8/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/zh_CN.UTF-8/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/zh_CN.gb18030/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/zh_CN.gb18030/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/zh_CN.gb18030/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/zh_CN.gbk/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/zh_CN.gbk/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/zh_CN.gbk/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/zh_HK.UTF-8/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/zh_HK.UTF-8/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/zh_HK.UTF-8/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/zh_HK.big5/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/zh_HK.big5/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/zh_HK.big5/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/zh_HK.big5hkscs/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/zh_HK.big5hkscs/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/zh_HK.big5hkscs/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/zh_TW/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/zh_TW/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/zh_TW/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/zh_TW.UTF-8/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/zh_TW.UTF-8/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/zh_TW.UTF-8/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/nls/zh_TW.big5/Makefile.in
===================================================================
--- trunk/lib/libx11/nls/zh_TW.big5/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/nls/zh_TW.big5/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -131,6 +131,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -145,6 +146,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/src/Makefile.in
===================================================================
--- trunk/lib/libx11/src/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/src/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -135,6 +135,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -149,6 +150,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/src/config.h.in
===================================================================
--- trunk/lib/libx11/src/config.h.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/src/config.h.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -123,6 +123,9 @@
 /* Location of libX11 data */
 #undef X11_DATADIR
 
+/* Location of libX11 library data */
+#undef X11_LIBDIR
+
 /* Include support for XCMS */
 #undef XCMS
 
@@ -142,6 +145,9 @@
 #undef XLOCALE
 
 /* Location of libX11 locale data */
+#undef XLOCALEDATADIR
+
+/* Location of libX11 locale data */
 #undef XLOCALEDIR
 
 /* Location of libX11 locale libraries */

Modified: trunk/lib/libx11/src/util/Makefile.in
===================================================================
--- trunk/lib/libx11/src/util/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/src/util/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -129,6 +129,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -143,6 +144,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/src/xcms/Makefile.in
===================================================================
--- trunk/lib/libx11/src/xcms/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/src/xcms/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -127,6 +127,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -141,6 +142,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/src/xkb/Makefile.in
===================================================================
--- trunk/lib/libx11/src/xkb/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/src/xkb/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -127,6 +127,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -141,6 +142,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@

Modified: trunk/lib/libx11/src/xlibi18n/Makefile.in
===================================================================
--- trunk/lib/libx11/src/xlibi18n/Makefile.in	2006-10-11 00:47:11 UTC (rev 3713)
+++ trunk/lib/libx11/src/xlibi18n/Makefile.in	2006-10-11 01:00:10 UTC (rev 3714)
@@ -127,6 +127,7 @@
 X11_LIBDIR = @X11_LIBDIR@
 X11_LIBS = @X11_LIBS@
 X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
 X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XCMS_FALSE = @XCMS_FALSE@
 XCMS_TRUE = @XCMS_TRUE@
@@ -141,6 +142,7 @@
 XKEYSYMDB = @XKEYSYMDB@
 XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
 XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@
Reply to: