X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=5a92a295e23d125a8c6370ef6da5d65a6474ee49;hb=1efb9743d0f36547560447cf4cf6ba9efb005fbb;hp=8437fc45776e31feef73266a47383210362fab62;hpb=ec079c249386cbb4e483f6e99241f38e1a44e468;p=m17n%2Fm17n-lib.git

diff --git a/configure.ac b/configure.ac
index 8437fc4..5a92a29 100644
--- 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
+dnl Copyright (C) 2003, 2004, 2005, 2006, 2007
 dnl   National Institute of Advanced Industrial Science and Technology (AIST)
 dnl   Registration Number H15PRO112
 
@@ -18,19 +18,23 @@ 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.0, m17n-lib-bug@m17n.org)
-AM_INIT_AUTOMAKE(m17n-lib, 1.3.0)
+AC_INIT(m17n-lib, 1.4.0, m17n-lib-bug@m17n.org)
+AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(src/config.h)
 AM_MAINTAINER_MODE
 
-API_VERSION=1:0:1
+API_VERSION=2:0:2
 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
@@ -93,7 +97,7 @@ dnl Checks if dlopen exists, and if it's in libc or libdl.
 
 AC_SEARCH_LIBS(dlopen, dl,
 	       AC_DEFINE(HAVE_DLOPEN, 1,
-	       [Define to 1 if you have the funciton dlopen.]))
+	       [Define to 1 if you have the function dlopen.]))
 
 dnl Check several libraries without adding -lxxx to LIBS, without
 dnl defining HAVE_LIBXXX nor HAVE_XXX_H because they are used only by
@@ -103,6 +107,8 @@ dnl augmented.
 
 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"
@@ -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`"
-    OTF_LD_FLAGS="`libotf-config --libs`  "
+    OTF_LD_FLAGS="`libotf-config --libs`"
     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)
-  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.])
@@ -208,8 +213,6 @@ if test "x$HAVE_FREETYPE_CONFIG" = "xyes"; then
 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"
@@ -244,27 +247,32 @@ LIBS="$save_LIBS"
 AC_SUBST(XFT2_LD_FLAGS)
 
 dnl Check for fontconfig usability.
-save_CPPFLAGS="$CPPFLAGS"
-save_LIBS="$LIBS"
-FONTCONFIG_LD_FLAGS=-lfontconfig
-if test "x$HAVE_PKG_CONFIG" = "xyes"; then
-  if pkg-config --exists fontconfig; then
-    CPPFLAGS="$CPPFLAGS `pkg-config --cflags fontconfig`"
-    FONTCONFIG_LD_FLAGS="`pkg-config --libs fontconfig`"
-    LIBS="$LIBS $FONTCONFIG_LD_FLAGS"
+AC_ARG_WITH(fontconfig,
+	    AC_HELP_STRING([--with-fontconfig],
+	                   [with FontConfig library (default is YES)]))
+if test "x$with_fontconfig" != "xno"; then
+  save_CPPFLAGS="$CPPFLAGS"
+  save_LIBS="$LIBS"
+  FONTCONFIG_LD_FLAGS=-lfontconfig
+  if test "x$HAVE_PKG_CONFIG" = "xyes"; then
+    if pkg-config --exists fontconfig; then
+      CPPFLAGS="$CPPFLAGS `pkg-config --cflags fontconfig`"
+      FONTCONFIG_LD_FLAGS="`pkg-config --libs fontconfig`"
+      LIBS="$LIBS $FONTCONFIG_LD_FLAGS"
+    fi
   fi
-fi
-AC_CHECK_LIB(fontconfig, FcInit, HAVE_FONTCONFIG=yes, HAVE_FONTCONFIG=no)
-AC_CHECK_HEADER(fontconfig/fontconfig.h, , HAVE_FONTCONFIG=no)
-if test "x$HAVE_FONTCONFIG" = "xyes"; then
-  AC_DEFINE(HAVE_FONTCONFIG, 1,
+  AC_CHECK_LIB(fontconfig, FcInit, HAVE_FONTCONFIG=yes, HAVE_FONTCONFIG=no)
+  AC_CHECK_HEADER(fontconfig/fontconfig.h, , HAVE_FONTCONFIG=no)
+  if test "x$HAVE_FONTCONFIG" = "xyes"; then
+    AC_DEFINE(HAVE_FONTCONFIG, 1,
 	      [Define to 1 if you have fontconfig library and header file.])
-  M17N_EXT_LIBS="$M17N_EXT_LIBS fontconfig"
-else
-  FONTCONFIG_LD_FLAGS=
-  CPPFLAGS="$save_CPPFLAGS"
+    M17N_EXT_LIBS="$M17N_EXT_LIBS fontconfig"
+  else
+    FONTCONFIG_LD_FLAGS=
+    CPPFLAGS="$save_CPPFLAGS"
+  fi
+  LIBS="$save_LIBS"
 fi
-LIBS="$save_LIBS"
 AC_SUBST(FONTCONFIG_LD_FLAGS)
 
 dnl Check for gdlib usability.
@@ -282,7 +290,7 @@ if test "x$with_gd" != "xno"; then
 	      [Define to 1 or 2 if you have gd library and header file.])
     M17N_EXT_LIBS="$M17N_EXT_LIBS gdlib"
     GD_LD_FLAGS=-lgd
-    CONFIG_FLAGS="$CONFIG_FLAGS -DHAVE_GD"
+    CONFIG_FLAGS="$CONFIG_FLAGS -DHAVE_GD=$HAVE_GD"
   fi
   LIBS="$save_LIBS"
 fi
@@ -427,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