*** empty log message ***

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

diff --git a/configure.ac b/configure.ac
index a5e20e2..8b4e301 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
+dnl Copyright (C) 2003, 2004, 2005, 2006, 2007

 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
 

@@ -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 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.
 
 
 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
 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)
 
 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
 dnl Checks for programs for compiling.
 AC_PROG_CC
 AC_LIBTOOL_DLOPEN

@@ -103,6 +107,8 @@ dnl augmented.
 
 M17N_EXT_LIBS=
 
 
 M17N_EXT_LIBS=
 

+AC_CHECK_PROG(HAVE_PKG_CONFIG, pkg-config, yes)
+

 if test "x$no_x" != "xyes"; then
   AC_DEFINE(HAVE_X11, 1, [Define to 1 if you have X11.])
   X11_LD_FLAGS="-lXt -lX11"
 if test "x$no_x" != "xyes"; then
   AC_DEFINE(HAVE_X11, 1, [Define to 1 if you have X11.])
   X11_LD_FLAGS="-lXt -lX11"

@@ -154,7 +160,7 @@ if test "x$with_libotf" != "xno"; then
   AC_CHECK_PROG(HAVE_OTFLIB_CONFIG, libotf-config, yes)
   if test "x$HAVE_OTFLIB_CONFIG" = "xyes"; then
     CPPFLAGS="$CPPFLAGS `libotf-config --cflags`"
   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`  "
+    OTF_LD_FLAGS="`libotf-config --libs`"

     LIBS="$LIBS $OTF_LD_FLAGS"
   else
     OTF_LD_FLAGS=-lotf
     LIBS="$LIBS $OTF_LD_FLAGS"
   else
     OTF_LD_FLAGS=-lotf

@@ -163,7 +169,6 @@ if test "x$with_libotf" != "xno"; then
   ## 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)
   ## 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)

-  CPPFLAGS="$save_CPPFLAGS"

   if test "x$HAVE_OTF" = "xyes"; then
     AC_DEFINE(HAVE_OTF, 1, 
              [Define to 1 if you have OTF library and header file.])
   if test "x$HAVE_OTF" = "xyes"; then
     AC_DEFINE(HAVE_OTF, 1, 
              [Define to 1 if you have OTF library and header file.])

@@ -208,8 +213,6 @@ if test "x$HAVE_FREETYPE_CONFIG" = "xyes"; then
 fi
 AC_SUBST(FREETYPE_LD_FLAGS)
 
 fi
 AC_SUBST(FREETYPE_LD_FLAGS)
 

-AC_CHECK_PROG(HAVE_PKG_CONFIG, pkg-config, yes)
-

 dnl Check for Xft2 usability.
 save_CPPFLAGS="$CPPFLAGS"
 save_LIBS="$LIBS"
 dnl Check for Xft2 usability.
 save_CPPFLAGS="$CPPFLAGS"
 save_LIBS="$LIBS"

@@ -432,7 +435,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
+AC_CONFIG_FILES([Makefile po/Makefile.in intl/Makefile

                  src/Makefile
                  example/Makefile
                 m17n-config
                  src/Makefile
                  example/Makefile
                 m17n-config