dnl Process this file with autoconf to produce a configure script.
-AC_INIT([m17n-lib],[1.6.1],[m17n-lib-bug@m17n.org])
+AC_INIT([m17n-lib],[1.6.2],[m17n-lib-bug@m17n.org])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE
-AC_PROG_LIBTOOL
-AC_CONFIG_HEADERS([src/config.h])
+AC_CONFIG_HEADERS([config.h])
AM_MAINTAINER_MODE
API_VERSION=4:0:4
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
+AC_PROG_LIBTOOL
dnl LT_PREREQ([2.2.4])
dnl LT_INIT
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"
- 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.
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