9 files changed, 97 insertions, 2 deletions
diff --git a/libX11/src/xlibi18n/XDefaultIMIF.c b/libX11/src/xlibi18n/XDefaultIMIF.c
index e97d2f444..36a457ea5 100644
--- a/libX11/src/xlibi18n/XDefaultIMIF.c
+++ b/libX11/src/xlibi18n/XDefaultIMIF.c
@@ -64,6 +64,7 @@ Sun Microsystems, Inc. or its licensors is granted.
 #include <config.h>
 #endif
 #include <stdio.h>
+#include <unistd.h>
 #include "Xlibint.h"
 #include "Xlcint.h"
 #include "XlcGeneric.h"
diff --git a/libX11/src/xlibi18n/XDefaultOMIF.c b/libX11/src/xlibi18n/XDefaultOMIF.c
index b1dc66df6..953475d37 100644
--- a/libX11/src/xlibi18n/XDefaultOMIF.c
+++ b/libX11/src/xlibi18n/XDefaultOMIF.c
@@ -69,6 +69,8 @@ Sun Microsystems, Inc. or its licensors is granted.
 #include <X11/Xos.h>
 #include <X11/Xatom.h>
 #include <stdio.h>
+#include <unistd.h>
+#include <stdint.h>
 
 #define MAXFONTS		100
 
diff --git a/libX11/src/xlibi18n/XimProto.h b/libX11/src/xlibi18n/XimProto.h
index 6b0096dd6..9551301a2 100644
--- a/libX11/src/xlibi18n/XimProto.h
+++ b/libX11/src/xlibi18n/XimProto.h
@@ -143,6 +143,13 @@ PERFORMANCE OF THIS SOFTWARE.
 /*
  * byte order
  */
+#ifdef BIGENDIAN
+#undef BIGENDIAN
+#endif
+#ifdef LITTLEENDIAN
+#undef LITTLEENDIAN
+#endif
+
 #define BIGENDIAN	(CARD8)0x42	/* MSB first */
 #define LITTLEENDIAN	(CARD8)0x6c	/* LSB first */
 
diff --git a/libX11/src/xlibi18n/lcDB.c b/libX11/src/xlibi18n/lcDB.c
index 97b22ac44..7f13cc3e2 100644
--- a/libX11/src/xlibi18n/lcDB.c
+++ b/libX11/src/xlibi18n/lcDB.c
@@ -48,6 +48,8 @@
 
 #endif	/* NOT_X_ENV */
 
+#include <stdint.h>
+
 /* specifying NOT_X_ENV allows users to just use
    the database parsing routine. */
 /* For UDC/VW */
@@ -63,6 +65,7 @@
 #endif
 
 #include <stdio.h>
+#include <unistd.h>
 
 typedef struct _DatabaseRec {
     char *category;
diff --git a/libX11/src/xlibi18n/lcDynamic.c b/libX11/src/xlibi18n/lcDynamic.c
index f6df94cbb..8d022d885 100644
--- a/libX11/src/xlibi18n/lcDynamic.c
+++ b/libX11/src/xlibi18n/lcDynamic.c
@@ -51,7 +51,7 @@ from The Open Group.
 #include "Xlcint.h"
 
 #ifndef XLOCALEDIR
-#define XLOCALEDIR "/usr/lib/X11/locale"
+#define XLOCALEDIR "locale"
 #endif
 
 #define LCLIBNAME    "xi18n.so"
diff --git a/libX11/src/xlibi18n/lcFile.c b/libX11/src/xlibi18n/lcFile.c
index 2c06fa2d7..576a61124 100644
--- a/libX11/src/xlibi18n/lcFile.c
+++ b/libX11/src/xlibi18n/lcFile.c
@@ -214,7 +214,7 @@ _XlcParsePath(
 }
 
 #ifndef XLOCALEDIR
-#define XLOCALEDIR "/usr/lib/X11/locale"
+#define XLOCALEDIR "locale"
 #endif
 
 void
diff --git a/libX11/src/xlibi18n/lcGeneric.c b/libX11/src/xlibi18n/lcGeneric.c
index 619cb47f9..bf85bfdbc 100644
--- a/libX11/src/xlibi18n/lcGeneric.c
+++ b/libX11/src/xlibi18n/lcGeneric.c
@@ -32,6 +32,7 @@
 #include <config.h>
 #endif
 #include <stdio.h>
+#include <unistd.h>
 #include "Xlibint.h"
 #include "XlcGeneric.h"
 
diff --git a/libX11/src/xlibi18n/lcPublic.c b/libX11/src/xlibi18n/lcPublic.c
index 1b1fb548a..12a344272 100644
--- a/libX11/src/xlibi18n/lcPublic.c
+++ b/libX11/src/xlibi18n/lcPublic.c
@@ -27,6 +27,7 @@
 #include <config.h>
 #endif
 #include <stdio.h>
+#include <unistd.h>
 #include "Xlibint.h"
 #include "XlcPubI.h"
 
diff --git a/libX11/src/xlibi18n/makefile b/libX11/src/xlibi18n/makefile
new file mode 100644
index 000000000..d5dfcf723
--- /dev/null
+++ b/libX11/src/xlibi18n/makefile
@@ -0,0 +1,80 @@
+#AM_CFLAGS= \
+#	-I$(top_srcdir)/include \
+#	-I$(top_srcdir)/include/X11 \
+#	-I$(top_builddir)/include \
+#	-I$(top_builddir)/include/X11 \
+#	-I$(top_srcdir)/src/xcms \
+#	-I$(top_srcdir)/src/xkb \
+#	-I$(top_srcdir)/src/xlibi18n \
+#	-I$(top_srcdir)/src \
+#	$(X11_CFLAGS) \
+#	$(BIGFONT_CFLAGS) \
+#	$(XDMCP_CFLAGS) \
+#	-D_BSD_SOURCE \
+#	$(XMALLOC_ZERO_CFLAGS)
+
+LIBRARY = libi18n
+
+
+#
+# Dynamic loading code for i18n modules
+#
+#if XLIB_LOADABLE_I18N
+#XI18N_DL_SOURCES = \
+#                  XlcDL.c \
+#                  XlcSL.c
+#else
+#
+# Static interfaces to input/output methods
+#
+#IM_LIBS = \
+#	${top_builddir}/modules/im/ximcp/libximcp.la
+
+#LC_LIBS = \
+#	${top_builddir}/modules/lc/def/libxlcDef.la \
+#	${top_builddir}/modules/lc/gen/libxlibi18n.la \
+#	${top_builddir}/modules/lc/Utf8/libxlcUTF8Load.la \
+#	${top_builddir}/modules/lc/xlocale/libxlocale.la
+
+#OM_LIBS = \
+#	${top_builddir}/modules/om/generic/libxomGeneric.la
+#endif
+
+#libi18n_la_LIBADD = \
+#	 $(IM_LIBS) $(LC_LIBS) $(OM_LIBS)
+
+INCLUDES += ..\..\include\X11
+DEFINES += XLOCALELIBDIR="\".\"" LIB11_DLL
+
+CSRCS = \
+	$(XI18N_DL_SOURCES) \
+	XDefaultIMIF.c \
+	XDefaultOMIF.c \
+	xim_trans.c\
+	ICWrap.c\
+	IMWrap.c\
+	imKStoUCS.c\
+	lcCT.c\
+	lcCharSet.c\
+	lcConv.c\
+	lcDB.c\
+	lcDynamic.c\
+	lcFile.c\
+	lcGeneric.c\
+	lcInit.c\
+	lcPrTxt.c\
+	lcPubWrap.c\
+	lcPublic.c\
+	lcRM.c\
+	lcStd.c\
+	lcTxtPr.c\
+	lcUTF8.c\
+	lcUtil.c\
+	lcWrap.c\
+	mbWMProps.c\
+	mbWrap.c\
+	utf8WMProps.c\
+	utf8Wrap.c\
+	wcWrap.c
+	
+