Index: Makefile.am
===================================================================
RCS file: /cvsroot/scim/scim-tables/Makefile.am,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile.am
--- Makefile.am	5 Dec 2005 07:13:12 -0000	1.12
+++ Makefile.am	11 May 2007 06:11:18 -0000
@@ -30,13 +30,13 @@ if SCIM_TABLES_ENABLE_SKIM_SUPPORT
 SKIM_SUBDIR=skim
 endif
 
-SUBDIRS 		= docs intl icons m4 po src tables $(SKIM_SUBDIR)
+SUBDIRS 		= docs icons po src tables $(SKIM_SUBDIR)
 
 MAINTAINERCLEANFILES 	= Makefile.in aclocal.m4 configure $(AUX_DIST)
 
 CLEANFILES		= *.bak 
 
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS =
 
 .PHONY: update-ChangeLog
 
Index: bootstrap
===================================================================
RCS file: /cvsroot/scim/scim-tables/bootstrap,v
retrieving revision 1.4
diff -u -p -r1.4 bootstrap
--- bootstrap	11 Mar 2005 01:27:53 -0000	1.4
+++ bootstrap	11 May 2007 06:11:18 -0000
@@ -20,12 +20,13 @@
 #! /bin/sh
 
 set -x
-aclocal -I m4
+glib-gettextize --force
+aclocal
 autoheader
 libtoolize -c --automake 
 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-tables/configure.ac,v
retrieving revision 1.52
diff -u -p -r1.52 configure.ac
--- configure.ac	8 Oct 2006 16:13:52 -0000	1.52
+++ configure.ac	11 May 2007 06:11:18 -0000
@@ -16,7 +16,9 @@ AM_CONFIG_HEADER([config.h])
 
 # Init gettext
 ALL_LINGUAS="zh_CN zh_TW ja ko de fr it pa"
-AM_GNU_GETTEXT
+AM_GLIB_GNU_GETTEXT
+LTLIBINTL=
+AC_SUBST(LTLIBINTL)
 
 AC_LIBTOOL_WIN32_DLL
 AC_LIBTOOL_DLOPEN
Index: src/scim_generic_table.cpp
===================================================================
RCS file: /cvsroot/scim/scim-tables/src/scim_generic_table.cpp,v
retrieving revision 1.10
diff -u -p -r1.10 scim_generic_table.cpp
--- src/scim_generic_table.cpp	12 Jan 2006 08:43:29 -0000	1.10
+++ src/scim_generic_table.cpp	11 May 2007 06:11:19 -0000
@@ -902,7 +902,7 @@ GenericTableContent::init (const Generic
 GenericTableContent::~GenericTableContent ()
 {
     if (m_mmapped) {
-        munmap (m_mmapped_ptr, m_mmapped_size);
+        munmap ((char*)m_mmapped_ptr, m_mmapped_size);
     } else if (m_content) {
         delete [] m_content;
     }
@@ -1548,7 +1548,7 @@ void
 GenericTableContent::clear ()
 {
     if (m_mmapped) {
-        munmap (m_mmapped_ptr, m_mmapped_size);
+        munmap ((char*)m_mmapped_ptr, m_mmapped_size);
     } else if (m_content) {
         delete [] m_content;
     }