diff -urN gcin-1.3.4.orig/Makefile gcin-1.3.4/Makefile
--- gcin-1.3.4.orig/Makefile	2007-04-10 09:56:33.000000000 +0800
+++ gcin-1.3.4/Makefile	2007-04-28 23:13:26.000000000 +0800
@@ -1,6 +1,7 @@
 OPTFLAGS=-g
 
 include config.mak
+LDFLAGS += -L/usr/X11R6/lib -lX11
 
 .SUFFIXES:	.c .o .E .pico
 
@@ -8,10 +8,10 @@
 gcin_pho_o = win-pho.o pho.o pho-util.o pho-sym.o table-update.o pho-dbg.o
 gcin_gtab_o = gtab.o win-gtab.o gtab-util.o gtab-list.o
 
-GCIN_SO= gcin1.so
+gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o pinyin.o win-pho-near.o
 
 OBJS=gcin.o eve.o util.o gcin-conf.o gcin-settings.o locale.o gcin-icon.o \
-     gcin-switch.o gcin-exec-script.o $(GCIN_SO) \
+     gcin-switch.o gcin-exec-script.o $(gcin1_o) \
      $(gcin_tsin_o) $(gcin_pho_o) $(gcin_gtab_o)
 
 OBJS_TSLEARN=tslearn.o util.o gcin-conf.o pho-util.o tsin-util.o gcin-send.o pho-sym.o \
@@ -75,15 +75,15 @@
 PROGS_CV=kbmcv pin-juyin
 
 all:	$(PROGS) trad2sim $(DATA) $(PROGS_CV) gcin.spec
+	ln -sf ~/NewCJ3/NewCJ3.cin data/
 	$(MAKE) -C data
 	$(MAKE) -C im-client
 	$(MAKE) -C gtk-im
-	$(MAKE) -C po
+#	$(MAKE) -C po
 	if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im; fi
 
 gcin:   $(OBJS) $(IMdkitLIB) $(im-srv)
-	LD_RUN_PATH=.:$(gcinlibdir) \
-	$(CC) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(im-srv) -lXtst $(LDFLAGS) -L/usr/X11R6/lib
+	$(CC) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(im-srv) -lXtst $(LDFLAGS) -L/usr/X11R6/$(LIB) -lintl
 	rm -f core.*
 	ln -sf $@ $@.test
 
@@ -101,7 +102,7 @@
 
 gcin-setup:     $(OBJS_gcin_steup)
 	rm -f core.*
-	$(CC) -o $@ $(OBJS_gcin_steup) $(LDFLAGS)
+	$(CC) -o $@ $(OBJS_gcin_steup) $(LDFLAGS) -lintl
 
 phoa2d: $(OBJS_phoa2d)
 	$(CC) -o $@ $(OBJS_phoa2d) $(LDFLAGS)
@@ -140,10 +140,6 @@
 pin-juyin:	$(OBJS_pin_juyin)
 	$(CC) -o $@ $(OBJS_pin_juyin) $(LDFLAGS)
 
-gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico win-pho-near.pico
-gcin1.so: $(gcin1_so)
-	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
-
 ### making the following as .so actuall makes the RSS larger
 gcin_gtab_so = gtab.pico win-gtab.pico gtab-util.pico
 gcin-gtab.so: $(gcin_gtab_so)
@@ -167,14 +163,11 @@
 ibin:
 	install $(PROGS) $(bindir); \
 	rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim
-	install $(GCIN_SO) $(gcinlibdir)
 
 install:
 	install -d $(datadir)/icons
 	install gcin.png $(datadir)/icons
 	$(MAKE) -C icons install
-	install -d $(gcinlibdir)
-	install $(GCIN_SO) $(gcinlibdir)
 	install -d $(bindir)
 	$(MAKE) -C data install
 	$(MAKE) -C im-client install
@@ -196,7 +189,7 @@
 	$(MAKE) -C menu install
 	$(MAKE) -C man install
 ifeq ($(USE_I18N),Y)
-	$(MAKE) -C po install
+#	$(MAKE) -C po install
 endif
 clean:
 	$(MAKE) -C IMdkit clean
@@ -208,7 +201,7 @@
 	$(MAKE) -C qt-im clean
 	$(MAKE) -C man clean
 	$(MAKE) -C menu clean
-	$(MAKE) -C po clean
+#	$(MAKE) -C po clean
 	rm -f *.o *.E *.db *.pico *.so config.mak tags $(PROGS) $(PROGS_CV) \
 	$(DATA) .depend gcin.spec trad2sim gcin.spec.tmp gcin.log
 	find . '(' -name '.ted*' -o -name '*~' -o -name 'core.*' -o -name 'vgcore.*' ')' -exec rm {} \;
diff -urN gcin-1.3.4.orig/configure gcin-1.3.4/configure
--- gcin-1.3.4.orig/configure	2007-04-10 09:56:33.000000000 +0800
+++ gcin-1.3.4/configure	2007-04-28 22:56:04.000000000 +0800
@@ -153,7 +153,7 @@
 
 
 OPTFLAGS="-g"
-if [ $prefix = /usr ]; then
+if [ $prefix = /usr/local ]; then
   OPTFLAGS="-O"
 fi
 
diff -urN gcin-1.3.4.orig/gtk-im/Makefile gcin-1.3.4/gtk-im/Makefile
--- gcin-1.3.4.orig/gtk-im/Makefile	2007-03-01 10:04:07.000000000 +0800
+++ gcin-1.3.4/gtk-im/Makefile	2007-04-28 22:56:04.000000000 +0800
@@ -26,7 +26,7 @@
 
 im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so
 	export LD_RUN_PATH=$(gcinlibdir) ;\
-	$(CC) $(SO_FLAGS) $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS)
+	$(CC) $(SO_FLAGS) $(OBJS) -L../im-client ../im-client/gcin-im-client.o ../im-client/im-addr.o ../im-client/gcin-conf.o ../im-client/gcin-crypt.o ../im-client/util.o -o $@ $(LDFLAGS)
 	rm -f core.*
 
 clean:
diff -urN gcin-1.3.4.orig/im-client/Makefile gcin-1.3.4/im-client/Makefile
--- gcin-1.3.4.orig/im-client/Makefile	2007-03-01 10:04:36.000000000 +0800
+++ gcin-1.3.4/im-client/Makefile	2007-04-28 22:56:04.000000000 +0800
@@ -19,7 +19,7 @@
 	$(CC) -c $(CFLAGS) -o $@ $<
 
 $(SOFILEVER):   $(OBJS)
-	$(CC) $(SO_FLAGS) -Wl,-soname,libgcin-im-client.so.1 $(OBJS) -o $@
+	$(CC) $(SO_FLAGS) $(OBJS) -o $@
 	ln -sf $(SOFILEVER) $(SOFILE)
 	ln -sf $(SOFILEVER) $(SOFILE).1
 	$(MAKE) -C ../gtk-im
@@ -27,9 +27,9 @@
 LOCALLIB=/usr/local/$(LIB)
 
 install:
-	install -d $(gcinlibdir)
-	install -m 755 $(SOFILEVER) $(gcinlibdir)
-	cd $(gcinlibdir); rm -f $(SOFILE); ln -s $(SOFILEVER) $(SOFILE); \
+	install -d $(libdir)
+	install -m 755 $(SOFILEVER) $(libdir)
+	cd $(libdir); rm -f $(SOFILE); ln -s $(SOFILEVER) $(SOFILE); \
 	ln -sf $(SOFILEVER) $(SOFILE).1
 	install -d $(includedir)
 	install -m 444 gcin-im-client.h $(includedir)
diff -urN gcin-1.3.4.orig/tray.c gcin-1.3.4/tray.c
--- gcin-1.3.4.orig/tray.c	2007-03-12 09:59:09.000000000 +0800
+++ gcin-1.3.4/tray.c	2007-04-28 22:56:04.000000000 +0800
@@ -270,7 +270,7 @@
   pango_layout_set_font_description(pango, desc);
 #if 1
   // strange bug, why do we need this ?
-  desc = pango_layout_get_font_description(pango);
+  //desc = pango_layout_get_font_description(pango);
 #endif
   pango_font_description_set_size(desc, 9 * PANGO_SCALE);
 
diff -uNr gcin-1.3.4/gcin.c gcin-1.3.4-new/gcin.c
--- gcin-1.3.4/gcin.c	2007-02-26 20:46:43.000000000 -0500
+++ gcin-1.3.4-new/gcin.c	2007-09-27 11:20:25.000000000 -0400
@@ -436,7 +436,7 @@
     lc_ctype = lc_all;
 
   if (!lc_ctype)
-    lc_ctype = "zh_TW.Big5";
+    lc_ctype = "en_US.UTF-8";
 
   char *lc;