1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
|
--- configure.ac.orig 2017-12-08 12:13:45 UTC
+++ configure.ac
@@ -107,7 +107,7 @@ if test x$with_gui != xno; then
dnl Checks if dlopen exists, and if it's in libc or libdl.
-AC_SEARCH_LIBS(dlopen, dl,
+AC_SEARCH_LIBS(dlopen, ,
AC_DEFINE(HAVE_DLOPEN, 1,
[Define to 1 if you have the function dlopen.]))
@@ -204,21 +204,21 @@ fi
AC_SUBST(OTF_LD_FLAGS)
dnl Check for Freetype2 usability.
-AC_CHECK_PROG(HAVE_FREETYPE_CONFIG, freetype-config, yes)
+AC_CHECK_PROG(HAVE_FREETYPE_CONFIG, pkg-config freetype2, yes)
if test "x$HAVE_FREETYPE_CONFIG" = "xyes"; then
- FREETYPE_INC=`freetype-config --cflags`
+ FREETYPE_INC=`pkg-config freetype2 --cflags`
save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $FREETYPE_INC"
AC_CHECK_HEADER(ft2build.h, HAVE_FREETYPE=yes,
HAVE_FREETYPE=no CPPFLAGS="$save_CPPFLAGS")
if test "x$HAVE_FREETYPE" = "xyes" ; then
save_LIBS="$LIBS"
- LIBS="$LIBS `freetype-config --libs`"
+ LIBS="$LIBS `pkg-config freetype2 --libs`"
AC_CHECK_LIB(freetype, FT_Init_FreeType, HAVE_FREETYPE=yes,
HAVE_FREETYPE=no)
LIBS="$save_LIBS"
if test "x$HAVE_FREETYPE" = "xyes"; then
- FREETYPE_LD_FLAGS=`freetype-config --libs`
+ FREETYPE_LD_FLAGS=`pkg-config freetype2 --libs`
AC_DEFINE(HAVE_FREETYPE, 1,
[Define to 1 if you have FreeType library and header file.])
M17N_EXT_LIBS="$M17N_EXT_LIBS freetype"
@@ -344,6 +344,10 @@ LIBS="$save_LIBS"
AC_SUBST(XML2_LD_FLAGS)
dnl Check for Anthy usability.
+AC_ARG_WITH(anthy,
+ AC_HELP_STRING([--with-anthy],
+ [with Anthy library (default is YES)]))
+if test "x$with_anthy" != "xno"; then
PKG_CHECK_MODULES(ANTHY, anthy, HAVE_ANTHY=yes, HAVE_ANTHY=no)
if test "x$HAVE_ANTHY" = "xyes"; then
@@ -353,6 +357,8 @@ if test "x$HAVE_ANTHY" = "xyes"; then
ANTHY_LD_FLAGS="$ANTHY_LIBS"
CONFIG_FLAGS="$CONFIG_FLAGS -DHAVE_ANTHY"
fi
+
+fi
AC_SUBST(ANTHY_LD_FLAGS)
dnl Check for Ispell usability.
@@ -367,11 +373,15 @@ dnl Check for Thai word-segmentation library.
dnl If we have one, define HAVE_THAI_WORDSEG and one of these:
dnl HAVE_LIBTHAI, HAVE_WORDCUT, or HAVE_WORDCUT_OLD
dnl In addition, set THAI_WORDSEG_LD_FLAGS to a proper value.
+AC_ARG_WITH(libthai,
+ AC_HELP_STRING([--with-libthai],
+ [with libThai library (default is YES)]))
+if test "x$with_libthai" != "xno"; then
PKG_CHECK_MODULES(LIBTHAI, libthai, HAVE_LIBTHAI=yes, HAVE_LIBTHAI=no)
PKG_CHECK_MODULES(WORDCUT, wordcut, HAVE_WORDCUT=yes, HAVE_WORDCUT=no)
-if test "x$HAVE_LIBTHAI" == "xyes"; then
+if test "x$HAVE_LIBTHAI" = "xyes"; then
AC_DEFINE(HAVE_LIBTHAI, 1, [Define if you have libthai])
THAI_WORDSEG_LD_FLAGS="$LIBTHAI_LIBS"
@@ -426,6 +436,8 @@ fi
if test "x$HAVE_THAI_WORDSEG" = "xyes"; then
AC_DEFINE(HAVE_THAI_WORDSEG, 1,
[Define if you have some Thai word-segmentation library])
+fi
+
fi
AC_SUBST(THAI_WORDSEG_LD_FLAGS)
|
