X Strike Force X.Org X11 SVN commit: r3691 - 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: r3691 - 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: Mon, 9 Oct 2006 13:09:34 -0400 (EDT)
Message-id: <[🔎] 20061009170934.59FAB5C05B@necrotic.deadbeast.net>
Mail-followup-to: debian-x@lists.debian.org
Author: dnusinow
Date: 2006-10-09 13:09:26 -0400 (Mon, 09 Oct 2006)
New Revision: 3691

Added:
   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:
* 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.

Modified: trunk/lib/libx11/Makefile.in
===================================================================
--- trunk/lib/libx11/Makefile.in	2006-10-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -178,6 +178,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@
@@ -192,6 +193,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/configure	2006-10-09 17:09:26 UTC (rev 3691)
@@ -910,12 +910,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
@@ -4498,7 +4500,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4501 "configure"' > conftest.$ac_ext
+  echo '#line 4503 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7462,11 +7464,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7465: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7467: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7469: \$? = $ac_status" >&5
+   echo "$as_me:7471: \$? = $ac_status" >&5
    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.
@@ -7730,11 +7732,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7733: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7735: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7737: \$? = $ac_status" >&5
+   echo "$as_me:7739: \$? = $ac_status" >&5
    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.
@@ -7834,11 +7836,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7837: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7839: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7841: \$? = $ac_status" >&5
+   echo "$as_me:7843: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -10275,7 +10277,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10278 "configure"
+#line 10280 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10375,7 +10377,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10378 "configure"
+#line 10380 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12743,11 +12745,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12746: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12748: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:12750: \$? = $ac_status" >&5
+   echo "$as_me:12752: \$? = $ac_status" >&5
    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.
@@ -12847,11 +12849,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12850: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12852: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12854: \$? = $ac_status" >&5
+   echo "$as_me:12856: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -14408,11 +14410,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14411: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14413: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14415: \$? = $ac_status" >&5
+   echo "$as_me:14417: \$? = $ac_status" >&5
    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.
@@ -14512,11 +14514,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14515: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14517: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14519: \$? = $ac_status" >&5
+   echo "$as_me:14521: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -16731,11 +16733,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16734: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16736: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16738: \$? = $ac_status" >&5
+   echo "$as_me:16740: \$? = $ac_status" >&5
    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.
@@ -16999,11 +17001,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17002: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17004: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17006: \$? = $ac_status" >&5
+   echo "$as_me:17008: \$? = $ac_status" >&5
    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.
@@ -17103,11 +17105,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17106: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17108: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:17110: \$? = $ac_status" >&5
+   echo "$as_me:17112: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -24227,8 +24229,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"
 
 
@@ -24242,90 +24281,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
@@ -24333,6 +24379,7 @@
 
 
 
+
 # Check whether --enable-malloc0returnsnull was given.
 if test "${enable_malloc0returnsnull+set}" = set; then
   enableval=$enable_malloc0returnsnull; MALLOC_ZERO_RETURNS_NULL=$enableval
@@ -25415,12 +25462,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
@@ -25428,7 +25477,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 70; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 72; then
     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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/debian/changelog	2006-10-09 17:09:26 UTC (rev 3691)
@@ -1,9 +1,12 @@
-libx11 (2:1.0.0-10) unstable; urgency=low
+libx11 (2:1.0.0-10) UNRELEASED; urgency=low
 
   * 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.
 
- -- David Nusinow <dnusinow@debian.org>  Wed, 27 Sep 2006 21:07:10 -0400
+ -- David Nusinow <dnusinow@debian.org>  Mon,  9 Oct 2006 13:08:15 -0400
 
 libx11 (2:1.0.0-9) unstable; urgency=low
 

Added: 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-09 17:09:26 UTC (rev 3691)
@@ -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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/debian/patches/series	2006-10-09 17:09:26 UTC (rev 3691)
@@ -16,3 +16,4 @@
 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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/include/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -155,6 +155,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@
@@ -169,6 +170,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/man/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/modules/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -151,6 +151,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@
@@ -165,6 +166,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/modules/im/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -151,6 +151,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@
@@ -165,6 +166,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/modules/im/ximcp/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -186,6 +186,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@
@@ -200,6 +201,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/modules/lc/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -151,6 +151,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@
@@ -165,6 +166,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/modules/lc/Utf8/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -177,6 +177,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@
@@ -191,6 +192,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/modules/lc/def/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -176,6 +176,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@
@@ -190,6 +191,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/modules/lc/gen/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -176,6 +176,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@
@@ -190,6 +191,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/modules/lc/xlocale/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -176,6 +176,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@
@@ -190,6 +191,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/modules/om/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -151,6 +151,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@
@@ -165,6 +166,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/modules/om/generic/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -179,6 +179,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@
@@ -193,6 +194,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/C/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -166,6 +166,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@
@@ -180,6 +181,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/armscii-8/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/el_GR.UTF-8/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/en_US.UTF-8/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/georgian-academy/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/georgian-ps/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/ibm-cp1133/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/iscii-dev/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/isiri-3342/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/iso8859-1/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/iso8859-10/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/iso8859-11/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/iso8859-13/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/iso8859-14/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/iso8859-15/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/iso8859-2/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/iso8859-3/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/iso8859-4/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/iso8859-5/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/iso8859-6/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/iso8859-7/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/iso8859-8/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/iso8859-9/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/iso8859-9e/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/ja/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/ja.JIS/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/ja.S90/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/ja.SJIS/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/ja.U90/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/ja_JP.UTF-8/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/ko/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/ko_KR.UTF-8/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/koi8-c/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/koi8-r/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/koi8-u/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/microsoft-cp1251/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/microsoft-cp1255/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/microsoft-cp1256/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/mulelao-1/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/nokhchi-1/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/pt_BR.UTF-8/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/ru_RU.UTF-8/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/tatar-cyr/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/th_TH/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/th_TH.UTF-8/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/tscii-0/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/vi_VN.tcvn/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/vi_VN.viscii/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/zh_CN/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/zh_CN.UTF-8/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/zh_CN.gb18030/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/zh_CN.gbk/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/zh_HK.UTF-8/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/zh_HK.big5/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/zh_HK.big5hkscs/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/zh_TW/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/zh_TW.UTF-8/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/nls/zh_TW.big5/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -160,6 +160,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@
@@ -174,6 +175,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/src/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -304,6 +304,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@
@@ -318,6 +319,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/src/config.h.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -114,6 +114,9 @@
 /* Location of libX11 data */
 #undef X11_DATADIR
 
+/* Location of libX11 library data */
+#undef X11_LIBDIR
+
 /* Include support for XCMS */
 #undef XCMS
 
@@ -133,6 +136,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/src/util/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -161,6 +161,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@
@@ -175,6 +176,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/src/xcms/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -181,6 +181,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@
@@ -195,6 +196,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/src/xkb/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -164,6 +164,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@
@@ -178,6 +179,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-09 09:36:17 UTC (rev 3690)
+++ trunk/lib/libx11/src/xlibi18n/Makefile.in	2006-10-09 17:09:26 UTC (rev 3691)
@@ -199,6 +199,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@
@@ -213,6 +214,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:
Prev by Date: Freee uncomparable DAATlNG SllTE.
Next by Date: Processing of xfree86_4.3.0.dfsg.1-14sarge2_i386.changes
Previous by thread: Freee uncomparable DAATlNG SllTE.
Next by thread: Processing of xfree86_4.3.0.dfsg.1-14sarge2_i386.changes
Index(es):
- Date
- Thread