Index: gauche-gtk/configure.ac
===================================================================
--- gauche-gtk.orig/configure.ac
+++ gauche-gtk/configure.ac
@@ -2,16 +2,15 @@ dnl
 dnl Configuring gauche-gtk2
 dnl  process this file with autoconf to generate 'configure'.
 dnl
-AC_PREREQ(2.54)
-AC_INIT(Gauche-gtk2, 0.6_pre1, shiro@acm.org)
+AC_PREREQ([2.69])
+AC_INIT([Gauche-gtk2],[0.6_pre1],[shiro@acm.org])
 
 AC_CONFIG_HEADER(src/gtk-config.h)
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_TARGET
 
 dnl Replace @LOCAL_PATHS@ by --with-local option.
 AC_ARG_WITH(local,
-  AC_HELP_STRING([--with-local=PATH:PATH...],
-                 [For each PATH, add PATH/include to the include search
+  AS_HELP_STRING([--with-local=PATH:PATH...],[For each PATH, add PATH/include to the include search
 paths and PATH/lib to the library search paths.  Useful if you have some
 libraries installed in non-standard places. ]),
   [
@@ -24,17 +23,17 @@ AC_SUBST(LOCAL_PATHS)
 
 # options for configure scripts
 AC_ARG_ENABLE(gtkgl,
-   AC_HELP_STRING([--enable-gtkgl], [Enable gtkglext interface.]), [
-   AC_DEFINE(HAVE_GTKGL, 1)
+   AS_HELP_STRING([--enable-gtkgl],[Enable gtkglext interface.]), [
+   AC_DEFINE(HAVE_GTKGL, 1, [Have gtkglext interface])
    GTKGL_SO="gauche-gtkgl.so"
    GTKGL_LIB="-lgtkgl";
    GTKGL_SCM="gtk/gtkgl.scm";
    PANGOFT2_LIB=""
 ])
 AC_ARG_ENABLE(glgd,
-   AC_HELP_STRING([--enable-glgd], [Enable glgd interface.]), [
-   AC_DEFINE(HAVE_GTKGL, 1)
-   AC_DEFINE(HAVE_GLGD, 1)
+   AS_HELP_STRING([--enable-glgd],[Enable glgd interface.]), [
+   AC_DEFINE(HAVE_GTKGL, 1, [Have gtkglext interface])
+   AC_DEFINE(HAVE_GLGD, 1, [Have gldg interface])
    GTKGL_SO="gauche-gtkgl.so"
    GTKGL_LIB="-lgtkgl";
    GTKGL_SCM="gtk/gtkgl.scm"
@@ -44,10 +43,10 @@ AC_ARG_ENABLE(glgd,
    GLGD_SCM="gtk/glgd.scm"
 ])
 AC_ARG_ENABLE(glgd-pango,
-   AC_HELP_STRING([--enable-glgd-pango], [Enable glgd interface with Pango.]), [
-   AC_DEFINE(HAVE_GTKGL, 1)
-   AC_DEFINE(HAVE_GLGD, 1)
-   AC_DEFINE(HAVE_GLGD_PANGO, 1)
+   AS_HELP_STRING([--enable-glgd-pango],[Enable glgd interface with Pango.]), [
+   AC_DEFINE(HAVE_GTKGL, 1, [Have gtkglext interface])
+   AC_DEFINE(HAVE_GLGD, 1, [Have gldg interface])
+   AC_DEFINE(HAVE_GLGD_PANGO, 1, [Have gldg interface with Pango])
    GTKGL_SO="gauche-gtkgl.so"
    GTKGL_LIB="-lgtkgl";
    GTKGL_SCM="gtk/gtkgl.scm"
@@ -113,4 +112,5 @@ $GAUCHE_PACKAGE make-gpd "$PACKAGE_NAME"
 
 # Output
 echo $PACKAGE_VERSION > VERSION
-AC_OUTPUT(Makefile src/Makefile lib/Makefile gtkgl/Makefile glgd/Makefile)
+AC_CONFIG_FILES([Makefile src/Makefile lib/Makefile gtkgl/Makefile glgd/Makefile])
+AC_OUTPUT