Fix help string for --enable-gui.

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

diff --git a/configure.ac b/configure.ac
index c376e19..aedb40d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl configure.ac -- autoconf script for the m17n library.
 
 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
 
 dnl   National Institute of Advanced Industrial Science and Technology (AIST)
 dnl   Registration Number H15PRO112
 

@@ -23,23 +23,31 @@ dnl Boston, MA 02110-1301, USA.
 
 dnl Process this file with autoconf to produce a configure script.
 
 
 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_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE

+AC_PROG_LIBTOOL

 AC_CONFIG_HEADERS([src/config.h])
 AM_MAINTAINER_MODE
 
 API_VERSION=4:0:4
 AC_SUBST(API_VERSION)
 
 AC_CONFIG_HEADERS([src/config.h])
 AM_MAINTAINER_MODE
 
 API_VERSION=4:0:4
 AC_SUBST(API_VERSION)
 

+# The earliest version that this release has binary compatibility
+# with.  This is used for module locations.
+M17N_BINARY_VERSION=1.0
+
+M17N_MODULE_DIR="m17n/$M17N_BINARY_VERSION"
+AC_SUBST(M17N_MODULE_DIR)
+

 AM_GNU_GETTEXT
 GETTEXTDIR="$datadir/locale"
 AC_SUBST(GETTEXTDIR)
 
 dnl Checks for programs for compiling.
 AC_PROG_CC
 AM_GNU_GETTEXT
 GETTEXTDIR="$datadir/locale"
 AC_SUBST(GETTEXTDIR)
 
 dnl Checks for programs for compiling.
 AC_PROG_CC

-LT_PREREQ([2.2.4])
-LT_INIT
+dnl LT_PREREQ([2.2.4])
+dnl LT_INIT

 
 dnl Checks for X libraries.
 AC_PATH_XTRA
 
 dnl Checks for X libraries.
 AC_PATH_XTRA

@@ -86,7 +94,7 @@ AC_SUBST(M17NDIR)
 dnl Checks which levels of APIs should be compiled.
 
 AC_ARG_ENABLE(gui,
 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)
 
 
 AM_CONDITIONAL(WITH_GUI, test x$with_gui != xno)