(compose_glyph_string): When the script `inherited' and

[m17n/m17n-lib.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index c45b94f..3ffe413 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl configure.ac -- autoconf script for the m17n library.
 
-dnl Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009
+dnl Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 dnl   National Institute of Advanced Industrial Science and Technology (AIST)
 dnl   Registration Number H15PRO112
 
@@ -23,7 +23,7 @@ dnl Boston, MA 02110-1301, USA.
 
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([m17n-lib],[1.6.0],[m17n-lib-bug@m17n.org])
+AC_INIT([m17n-lib],[1.6.1],[m17n-lib-bug@m17n.org])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE
 AC_CONFIG_HEADERS([src/config.h])
@@ -39,14 +39,19 @@ M17N_BINARY_VERSION=1.0
 M17N_MODULE_DIR="m17n/$M17N_BINARY_VERSION"
 AC_SUBST(M17N_MODULE_DIR)
 
+
+dnl Checks for programs for compiling.
+AC_PROG_CC
+AC_GNU_SOURCE
+
 AM_GNU_GETTEXT
+AM_GNU_GETTEXT_VERSION([0.17])
 GETTEXTDIR="$datadir/locale"
 AC_SUBST(GETTEXTDIR)
 
-dnl Checks for programs for compiling.
-AC_PROG_CC
-LT_PREREQ([2.2.4])
-LT_INIT
+AC_PROG_LIBTOOL
+dnl LT_PREREQ([2.2.4])
+dnl LT_INIT
 
 dnl Checks for X libraries.
 AC_PATH_XTRA
@@ -93,7 +98,7 @@ AC_SUBST(M17NDIR)
 dnl Checks which levels of APIs should be compiled.
 
 AC_ARG_ENABLE(gui,
-             AS_HELP_STRING([--with-gui],[with GUI level APIs (default is YES)]))
+             AS_HELP_STRING([--enable-gui],[enable GUI level APIs (default is YES)]))
 
 AM_CONDITIONAL(WITH_GUI, test x$with_gui != xno)
 
@@ -439,7 +444,7 @@ esac
 AC_DEFINE_UNQUOTED(DLOPEN_SHLIB_EXT, "$SHLIB_EXT",
                   [Define to loadable module extention])
 
-AC_CONFIG_FILES([Makefile po/Makefile.in intl/Makefile
+AC_CONFIG_FILES([Makefile intl/Makefile po/Makefile.in
                  src/Makefile
                  example/Makefile
                 m17n-config