Index: Makefile.am
===================================================================
RCS file: /cvsroot/scim/scim-hangul/Makefile.am,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile.am
--- Makefile.am	1 Nov 2005 14:46:00 -0000	1.5
+++ Makefile.am	11 May 2007 05:54:26 -0000
@@ -33,7 +33,7 @@ SKIM_SUBDIR=skim
 endif
 
 AUTOMAKE_OPTIONS 	= gnu
-SUBDIRS 		= m4 intl src data po $(SKIM_SUBDIR)
+SUBDIRS 		= src data po $(SKIM_SUBDIR)
 ## @start 1
 MAINTAINERCLEANFILES 	= Makefile.in aclocal.m4 configure config.h.in $(AUX_DIST)
 
@@ -45,7 +45,7 @@ ACLOCAL			= aclocal -I $(ac_aux_dir)
 ## @start 2
 ## docdir			= $(top_builddir)/doc
 
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS =
 
 .PHONY: changelog
 
Index: bootstrap
===================================================================
RCS file: /cvsroot/scim/scim-hangul/bootstrap,v
retrieving revision 1.2
diff -u -p -r1.2 bootstrap
--- bootstrap	23 Mar 2005 18:13:55 -0000	1.2
+++ bootstrap	11 May 2007 05:54:26 -0000
@@ -20,12 +20,13 @@
 #! /bin/sh
 
 set -x
+glib-gettextize --force
 aclocal ${ACLOCAL_FLAGS}
 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-hangul/configure.ac,v
retrieving revision 1.12
diff -u -p -r1.12 configure.ac
--- configure.ac	6 Jan 2007 16:23:33 -0000	1.12
+++ configure.ac	11 May 2007 05:54:26 -0000
@@ -23,7 +23,9 @@ AM_CONFIG_HEADER([config.h])
 
 # Init gettext
 ALL_LINGUAS="de fr ja ko pa zh_CN"
-AM_GNU_GETTEXT
+AM_GLIB_GNU_GETTEXT
+LTLIBINTL=
+AC_SUBST(LTLIBINTL)
 
 GETTEXT_PACKAGE=scim-hangul
 AC_SUBST(GETTEXT_PACKAGE)