*** empty log message ***

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

diff --git a/configure.ac b/configure.ac
index 6b9bd88..8b4e301 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
+dnl Copyright (C) 2003, 2004, 2005, 2006, 2007
 dnl   National Institute of Advanced Industrial Science and Technology (AIST)
 dnl   Registration Number H15PRO112
 
@@ -18,12 +18,12 @@ dnl Lesser General Public License for more details.
 
 dnl You should have received a copy of the GNU Lesser General Public
 dnl License along with the m17n library; if not, write to the Free
-dnl Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-dnl 02111-1307, USA.
+dnl Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+dnl Boston, MA 02110-1301, USA.
 
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(m17n-lib, 1.3.4, m17n-lib-bug@m17n.org)
+AC_INIT(m17n-lib, 1.3.5, m17n-lib-bug@m17n.org)
 AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(src/config.h)
 AM_MAINTAINER_MODE
@@ -31,6 +31,10 @@ AM_MAINTAINER_MODE
 API_VERSION=1:0:1
 AC_SUBST(API_VERSION)
 
+AM_GNU_GETTEXT
+GETTEXTDIR="$datadir/locale"
+AC_SUBST(GETTEXTDIR)
+
 dnl Checks for programs for compiling.
 AC_PROG_CC
 AC_LIBTOOL_DLOPEN
@@ -153,34 +157,22 @@ AC_ARG_WITH(libotf,
 if test "x$with_libotf" != "xno"; then
   save_CPPFLAGS="$CPPFLAGS"
   save_LIBS="$LIBS"
-  if test "x$HAVE_PKG_CONFIG" = "xyes" ; then
-    if pkg-config --exists libotf; then
-      HAVE_OTF=yes
-      CPPFLAGS="$CPPFLAGS `pkg-config --cflags libotf`"
-      OTF_LD_FLAGS="`pkg-config --libs libotf`"
-    else
-      HAVE_OTF=no
-    fi
+  AC_CHECK_PROG(HAVE_OTFLIB_CONFIG, libotf-config, yes)
+  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
-    AC_CHECK_PROG(HAVE_OTFLIB_CONFIG, libotf-config, yes)
-    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
-    fi
-    ## We check the availability of OTF_check_features
-    ## because we need libotf-0.9.4 or the later.
-    AC_CHECK_LIB(otf, OTF_check_features, HAVE_OTF=yes, HAVE_OTF=no)
-    AC_CHECK_HEADER(otf.h,, HAVE_OTF=no)
-    if test "x$HAVE_OTF" = "xyes"; then
-      AC_DEFINE(HAVE_OTF, 1, 
-               [Define to 1 if you have OTF library and header file.])
-    fi
+    OTF_LD_FLAGS=-lotf
   fi
+  ## We check the availability of OTF_check_features
+  ## because we need libotf-0.9.4 or the later.
+  AC_CHECK_LIB(otf, OTF_check_features, HAVE_OTF=yes, HAVE_OTF=no)
+  AC_CHECK_HEADER(otf.h,, HAVE_OTF=no)
   if test "x$HAVE_OTF" = "xyes"; then
-      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"
   else
     CPPFLAGS="$save_CPPFLAGS"
     OTF_LD_FLAGS=
@@ -443,7 +435,7 @@ esac
 AC_DEFINE_UNQUOTED(DLOPEN_SHLIB_EXT, "$SHLIB_EXT",
                   [Define to loadable module extention])
 
-AC_CONFIG_FILES([Makefile
+AC_CONFIG_FILES([Makefile po/Makefile.in intl/Makefile
                  src/Makefile
                  example/Makefile
                 m17n-config