From: handa <handa>
Date: Wed, 29 Jul 2009 07:56:04 +0000 (+0000)
Subject: Add AC_CONFIG_MACRO_DIR([m4]).  Update by autoupdate program.
X-Git-Tag: REL-1-5-5-RC1~5
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=1b9abdfcd981455d43a11eadce300ecc8b6de98b;p=m17n%2Fm17n-lib.git

Add AC_CONFIG_MACRO_DIR([m4]).  Update by autoupdate program.
---

diff --git a/configure.ac b/configure.ac
index 3b3da20..9419bb8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,10 +23,10 @@ dnl Boston, MA 02110-1301, USA.
 
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(m17n-lib, 1.5.5, m17n-lib-bug@m17n.org)
+AC_INIT([m17n-lib],[1.5.5],[m17n-lib-bug@m17n.org])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE
-AM_CONFIG_HEADER(src/config.h)
+AC_CONFIG_HEADERS([src/config.h])
 AM_MAINTAINER_MODE
 
 API_VERSION=3:0:3
@@ -38,9 +38,13 @@ AC_SUBST(GETTEXTDIR)
 
 dnl Checks for programs for compiling.
 AC_PROG_CC
-AC_LIBTOOL_DLOPEN
-AC_LIBLTDL_CONVENIENCE
-AM_PROG_LIBTOOL
+_LT_SET_OPTION([LT_INIT],[dlopen])
+AC_DIAGNOSE([obsolete],[AC_LIBTOOL_DLOPEN: Remove this warning and the call to _LT_SET_OPTION when you
+put the `dlopen' option into LT_INIT's first parameter.])
+
+_LT_CONFIG_LTDL_DIR([m4_default([], [libltdl])])
+_LTDL_CONVENIENCE
+LT_INIT
 
 dnl Checks for X libraries.
 AC_PATH_XTRA
@@ -87,8 +91,7 @@ AC_SUBST(M17NDIR)
 dnl Checks which levels of APIs should be compiled.
 
 AC_ARG_ENABLE(gui,
-	      AC_HELP_STRING([--with-gui],
-			     [with GUI level APIs (default is YES)]))
+	      AS_HELP_STRING([--with-gui],[with GUI level APIs (default is YES)]))
 
 AM_CONDITIONAL(WITH_GUI, test x$with_gui != xno)
 
@@ -152,8 +155,7 @@ AC_SUBST(FRIBIDI_LD_FLAGS)
 
 dnl Check for otflib usability.
 AC_ARG_WITH(libotf, 
-	    AC_HELP_STRING([--with-libotf],
-			   [with OpenType font suport (default is YES)]))
+	    AS_HELP_STRING([--with-libotf],[with OpenType font suport (default is YES)]))
 
 if test "x$with_libotf" != "xno"; then
   save_CPPFLAGS="$CPPFLAGS"
@@ -249,8 +251,7 @@ AC_SUBST(XFT2_LD_FLAGS)
 
 dnl Check for fontconfig usability.
 AC_ARG_WITH(fontconfig,
-	    AC_HELP_STRING([--with-fontconfig],
-	                   [with FontConfig library (default is YES)]))
+	    AS_HELP_STRING([--with-fontconfig],[with FontConfig library (default is YES)]))
 if test "x$with_fontconfig" != "xno"; then
   save_CPPFLAGS="$CPPFLAGS"
   save_LIBS="$LIBS"
@@ -278,8 +279,7 @@ AC_SUBST(FONTCONFIG_LD_FLAGS)
 
 dnl Check for gdlib usability.
 AC_ARG_WITH(gd, 
-	    AC_HELP_STRING([--with-gd],
-			   [suport graphic device by GD library (default is YES)]))
+	    AS_HELP_STRING([--with-gd],[suport graphic device by GD library (default is YES)]))
 
 if test "x$with_gd" != "xno"; then
   save_LIBS="$LIBS"
@@ -363,12 +363,12 @@ elif test "x$HAVE_WORDCUT" = "xyes"; then
 
   save_CPPFLAGS="$CPPFLAGS"
   CPPFLAGS="$CPPFLAGS $WORDCUT_CFLAGS"
-  AC_TRY_CPP([#include <wordcut/wcwordcut.h>], , HAVE_WORDCUT=no)
+  AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <wordcut/wcwordcut.h>]])],[],[HAVE_WORDCUT=no])
   if test "x$HAVE_WORDCUT" = "xno"; then
     PKG_CHECK_MODULES(GLIB_2_0, glib-2.0, HAVE_GLIB_2_0=yes, HAVE_GLIB_2_0=no)
     if test "x$HAVE_GLIB_2_0" = "xyes"; then
       CPPFLAGS="$CPPFLAGS $GLIB_2_0_CFLAGS"
-      AC_TRY_CPP([#include <wordcut/wcwordcut.h>], HAVE_WORDCUT=yes)
+      AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <wordcut/wcwordcut.h>]])],[HAVE_WORDCUT=yes],[])
     fi
   fi
   if test "x$HAVE_WORDCUT" = "xyes"; then