diff options
| author | Kenichi Handa | 2007-12-01 02:43:56 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2007-12-01 02:43:56 +0000 |
| commit | 5913f81dd0f7d78cdba7692caed6f73b39a823d3 (patch) | |
| tree | 4d0fdd57cb6987404927b7c613d2356ca2cf224d | |
| parent | 88501357facf6e37c2af737982a6d65e6a28a3eb (diff) | |
| download | emacs-5913f81dd0f7d78cdba7692caed6f73b39a823d3.tar.gz emacs-5913f81dd0f7d78cdba7692caed6f73b39a823d3.zip | |
Check the availability of m17n-flt library.
| -rw-r--r-- | ChangeLog.unicode | 4 | ||||
| -rw-r--r-- | configure.in | 17 |
2 files changed, 21 insertions, 0 deletions
diff --git a/ChangeLog.unicode b/ChangeLog.unicode index c5bf87ce6e2..1af8e347756 100644 --- a/ChangeLog.unicode +++ b/ChangeLog.unicode | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2007-12-01 Kenichi Handa <handa@ni.aist.go.jp> | ||
| 2 | |||
| 3 | * configure.in: Check the availability of m17n-flt library. | ||
| 4 | |||
| 1 | 2007-06-12 Juanma Barranquero <lekktu@gmail.com> | 5 | 2007-06-12 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 6 | ||
| 3 | * .cvsignore: Add data and site-lisp. | 7 | * .cvsignore: Add data and site-lisp. |
diff --git a/configure.in b/configure.in index 17dfa3f11bb..7150e5fa0ba 100644 --- a/configure.in +++ b/configure.in | |||
| @@ -2542,6 +2542,23 @@ AC_SUBST(FONTCONFIG_LIBS) | |||
| 2542 | AC_SUBST(LIBOTF_CFLAGS) | 2542 | AC_SUBST(LIBOTF_CFLAGS) |
| 2543 | AC_SUBST(LIBOTF_LIBS) | 2543 | AC_SUBST(LIBOTF_LIBS) |
| 2544 | 2544 | ||
| 2545 | dnl Check if --with-pkg-config-prog has been given. | ||
| 2546 | if test "X${with_pkg_config_prog}" != X; then | ||
| 2547 | PKG_CONFIG="${with_pkg_config_prog}" | ||
| 2548 | fi | ||
| 2549 | dnl Checks for libraries. | ||
| 2550 | PKG_CHECK_MODULES(M17N_FLT, m17n-flt, pkg_check_m17n_flt=yes, | ||
| 2551 | pkg_check_m17n_flt=no) | ||
| 2552 | if test "$pkg_check_m17n_flt" = "yes"; then | ||
| 2553 | AC_DEFINE(HAVE_M17N_FLT, 1, | ||
| 2554 | [Define to 1 if you have m17n-flt library.]) | ||
| 2555 | AC_SUBST(M17N_FLT_CFLAGS) | ||
| 2556 | AC_SUBST(M17N_FLT_LIBS) | ||
| 2557 | C_SWITCH_X_SITE="$C_SWITCH_X_SITE $M17N_FLT_CFLAGS" | ||
| 2558 | CFLAGS="$CFLAGS $M17N_FLT_CFLAGS" | ||
| 2559 | LIBS="$LIBS $M17N_FLT_LIBS" | ||
| 2560 | fi | ||
| 2561 | |||
| 2545 | fi | 2562 | fi |
| 2546 | 2563 | ||
| 2547 | ### Use -lXpm if available, unless `--with-xpm=no'. | 2564 | ### Use -lXpm if available, unless `--with-xpm=no'. |