(M17NLIB_PATCH_LEVEL): Changed to 4.

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

diff --git a/configure.ac b/configure.ac
index ab892af..8344c70 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, 2010
+dnl Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011

 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,10 +23,10 @@ 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.1],[m17n-lib-bug@m17n.org])
+AC_INIT([m17n-lib],[1.6.3],[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
 
 API_VERSION=4:0:4
 AM_MAINTAINER_MODE
 
 API_VERSION=4:0:4

@@ -168,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.

@@ -444,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