Index: Makefile.am
===================================================================
RCS file: /cvsroot/scim/scim-pinyin/Makefile.am,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile.am
--- Makefile.am	6 Aug 2005 17:03:54 -0000	1.6
+++ Makefile.am	8 May 2007 18:04:23 -0000
@@ -33,11 +33,11 @@ SKIM_SUBDIR=skim
 endif
 
 AUTOMAKE_OPTIONS 	= gnu
-SUBDIRS 		= m4  src data intl po $(SKIM_SUBDIR)
+SUBDIRS 		= src data po $(SKIM_SUBDIR)
 
 ## @start 1
 MAINTAINERCLEANFILES 	= Makefile.in aclocal.m4 configure config.h.in $(AUX_DIST)
 
 CLEANFILES		= *.bak src/*.bak 
 
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS =
Index: bootstrap
===================================================================
RCS file: /cvsroot/scim/scim-pinyin/bootstrap,v
retrieving revision 1.2
diff -u -p -r1.2 bootstrap
--- bootstrap	5 Mar 2005 21:23:44 -0000	1.2
+++ bootstrap	8 May 2007 18:04:23 -0000
@@ -20,12 +20,12 @@
 #! /bin/sh
 
 set -x
-aclocal -I m4
+aclocal
 autoheader
 libtoolize -c --automake --force
 automake --add-missing --copy --include-deps
 autoconf
-cd skim
-./bootstrap
-cd ..
+#cd skim
+#./bootstrap
+#cd ..
 ## @end 1
Index: configure.ac
===================================================================
RCS file: /cvsroot/scim/scim-pinyin/configure.ac,v
retrieving revision 1.10
diff -u -p -r1.10 configure.ac
--- configure.ac	12 Aug 2005 01:09:34 -0000	1.10
+++ configure.ac	8 May 2007 18:04:23 -0000
@@ -15,7 +15,12 @@ AM_CONFIG_HEADER([config.h])
 
 # Init gettext
 ALL_LINGUAS="zh_CN zh_TW ko ja de fr it"
-AM_GNU_GETTEXT
+AM_GLIB_GNU_GETTEXT
+LTLIBINTL=
+AC_SUBST(LTLIBINTL)
+
+# Check intltool
+IT_PROG_INTLTOOL([0.33], [no-xml])
 
 # Init libtool
 AC_LIBTOOL_WIN32_DLL
Index: src/scim_pinyin.cpp
===================================================================
RCS file: /cvsroot/scim/scim-pinyin/src/scim_pinyin.cpp,v
retrieving revision 1.3
diff -u -p -r1.3 scim_pinyin.cpp
--- src/scim_pinyin.cpp	8 Aug 2005 06:11:16 -0000	1.3
+++ src/scim_pinyin.cpp	8 May 2007 18:04:26 -0000
@@ -1867,7 +1867,7 @@ PinyinTable::find_keys (PinyinKeyVector 
 
     vec.clear ();
 
-    std::pair<ReversePinyinMap::const_iterator, ReversePinyinMap::const_iterator> result = 
+    std::pair<ReversePinyinMap::iterator, ReversePinyinMap::iterator> result = 
         m_revmap.equal_range (code);
     
     for (ReversePinyinMap::const_iterator i = result.first; i != result.second; i++)
Index: src/scim_pinyin.h
===================================================================
RCS file: /cvsroot/scim/scim-pinyin/src/scim_pinyin.h,v
retrieving revision 1.3
diff -u -p -r1.3 scim_pinyin.h
--- src/scim_pinyin.h	6 Aug 2005 15:19:01 -0000	1.3
+++ src/scim_pinyin.h	8 May 2007 18:04:27 -0000
@@ -975,7 +975,7 @@ class PinyinTable
     typedef std::multimap<ucs4_t, PinyinKey> ReversePinyinMap;
 #endif
 
-    typedef std::pair<ucs4_t,PinyinKey> ReversePinyinPair;
+    typedef std::pair<const ucs4_t,PinyinKey> ReversePinyinPair;
     typedef std::vector<PinyinEntry> PinyinEntryVector;
 
     /**