Update copyright years

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

diff --git a/configure.ac b/configure.ac
index 9419bb8..b9c12e6 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, 2011, 2012

 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,28 +23,35 @@ 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.5.5],[m17n-lib-bug@m17n.org])
+AC_INIT([m17n-lib],[1.6.4],[m17n-lib-bug@m17n.org])

 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE

-AC_CONFIG_HEADERS([src/config.h])
+AC_CONFIG_HEADERS([config.h])

 AM_MAINTAINER_MODE
 
 AM_MAINTAINER_MODE
 

-API_VERSION=3:0:3
+API_VERSION=4:0:4

 AC_SUBST(API_VERSION)
 
 AC_SUBST(API_VERSION)
 

-AM_GNU_GETTEXT
-GETTEXTDIR="$datadir/locale"
-AC_SUBST(GETTEXTDIR)
+# 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)
+

 
 dnl Checks for programs for compiling.
 AC_PROG_CC
 
 dnl Checks for programs for compiling.
 AC_PROG_CC

-_LT_SET_OPTION([LT_INIT],[dlopen])
-AC_DIAGNOSE([obsolete],[AC_LIBTOOL_DLOPEN: Remove this warning and the call to _LT_SET_OPTION when you
-put the `dlopen' option into LT_INIT's first parameter.])
+AC_GNU_SOURCE
+
+AM_GNU_GETTEXT
+AM_GNU_GETTEXT_VERSION([0.17])
+GETTEXTDIR="$datadir/locale"
+AC_SUBST(GETTEXTDIR)

 
 

-_LT_CONFIG_LTDL_DIR([m4_default([], [libltdl])])
-_LTDL_CONVENIENCE
-LT_INIT
+AC_PROG_LIBTOOL
+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

@@ -91,7 +98,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)
 

@@ -161,12 +168,16 @@ if test "x$with_libotf" != "xno"; then
   save_CPPFLAGS="$CPPFLAGS"
   save_LIBS="$LIBS"
   AC_CHECK_PROG(HAVE_OTFLIB_CONFIG, libotf-config, yes)
   save_CPPFLAGS="$CPPFLAGS"
   save_LIBS="$LIBS"
   AC_CHECK_PROG(HAVE_OTFLIB_CONFIG, libotf-config, yes)

+  OTF_LD_FLAGS=-lotf

   if test "x$HAVE_OTFLIB_CONFIG" = "xyes"; then
     CPPFLAGS="$CPPFLAGS `libotf-config --cflags`"
     OTF_LD_FLAGS="`libotf-config --libs`"
     LIBS="$LIBS $OTF_LD_FLAGS"
   if test "x$HAVE_OTFLIB_CONFIG" = "xyes"; then
     CPPFLAGS="$CPPFLAGS `libotf-config --cflags`"
     OTF_LD_FLAGS="`libotf-config --libs`"
     LIBS="$LIBS $OTF_LD_FLAGS"

-  else
-    OTF_LD_FLAGS=-lotf
+  elif test "x$HAVE_PKG_CONFIG" = "xyes" ; then
+    if pkg-config libotf ; then
+      CPPFLAGS="$CPPFLAGS `pkg-config --cflags libotf`"
+      OTF_LD_FLAGS="`pkg-config --libs libotf`"
+    fi

   fi
   ## We check the availability of OTF_check_features
   ## because we need libotf-0.9.4 or the later.
   fi
   ## We check the availability of OTF_check_features
   ## because we need libotf-0.9.4 or the later.

@@ -176,6 +187,12 @@ if test "x$with_libotf" != "xno"; then
     AC_DEFINE(HAVE_OTF, 1, 
              [Define to 1 if you have OTF library and header file.])
     M17N_EXT_LIBS="$M17N_EXT_LIBS libotf"
     AC_DEFINE(HAVE_OTF, 1, 
              [Define to 1 if you have OTF library and header file.])
     M17N_EXT_LIBS="$M17N_EXT_LIBS libotf"

+    AC_CHECK_LIB(otf, OTF_drive_gpos2, HAVE_OTF_DRIVE_GPOS2=yes,
+                HAVE_OTF_DRIVE_GPOS2=no)
+    if test "x$HAVE_OTF_DRIVE_GPOS2" = "xyes"; then
+      AC_DEFINE(HAVE_OTF_DRIVE_GPOS2, 1,
+                [Define to 1 if the OTF library has OTF_drive_gpos2().])
+    fi

   else
     CPPFLAGS="$save_CPPFLAGS"
     OTF_LD_FLAGS=
   else
     CPPFLAGS="$save_CPPFLAGS"
     OTF_LD_FLAGS=

@@ -431,7 +448,7 @@ esac
 AC_DEFINE_UNQUOTED(DLOPEN_SHLIB_EXT, "$SHLIB_EXT",
                   [Define to loadable module extention])
 
 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
                  src/Makefile
                  example/Makefile
                 m17n-config