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
|
From: Hideki Yamane <henrich@debian.org>
Date: Fri, 9 Feb 2018 23:04:58 +0900
Subject: detect oniguruma without onig-config
---
configure.ac | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/configure.ac b/configure.ac
index 3c12182..0bd2e35 100644
--- a/configure.ac
+++ b/configure.ac
@@ -346,13 +346,10 @@ AC_MSG_CHECKING([whether to use Oniguruma])
if test "$ac_cv_enable_oniguruma" = yes; then
AC_MSG_RESULT(yes)
AC_MSG_CHECKING([whether Oniguruma is available])
- dnl AC_CHECK_PROG(ONIG_CONFIG, onig-config, onig-config)
- ONIG_CONFIG=onig-config
- ONIG_VERSION=`$ONIG_CONFIG --version 2>/dev/null`
- if test "x$ONIG_VERSION" != "x"; then
+ if `pkg-config --exists oniguruma`; then
AC_MSG_RESULT(yes)
- CFLAGS="$CFLAGS `$ONIG_CONFIG --cflags`"
- LIBS="$LIBS `$ONIG_CONFIG --libs`"
+ CFLAGS="$CFLAGS `pkg-config --cflags oniguruma`"
+ LIBS="$LIBS `pkg-config --libs oniguruma`"
AC_DEFINE(USE_ONIGURUMA, 1, Define if you want to use Oniguruma.)
else
AC_MSG_RESULT(no)
|
