alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bump xapian requirement to 1.4.x

Browse Source 
In particular, we need Mset::Iterator to be a random_access_iterator.
This commit is contained in:
djcb
2019-01-20 15:38:50 +02:00
parent 9f187e7edf
commit a9b53351b6
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
configure.ac
View File

@ -171,7 +171,7 @@ AS_IF([test "x$have_json_glib" = "xyes"],[
]) ])
AM_CONDITIONAL(HAVE_JSON_GLIB,[test "x$have_json_glib" = "xyes"]) AM_CONDITIONAL(HAVE_JSON_GLIB,[test "x$have_json_glib" = "xyes"])
# xapian checking - we need 1.2.x at least # xapian checking - we need 1.4 at least
AC_CHECK_PROG(XAPIAN_CONFIG,xapian-config,xapian-config,no) AC_CHECK_PROG(XAPIAN_CONFIG,xapian-config,xapian-config,no)
AM_CONDITIONAL(HAVE_XAPIAN,test "x$XAPIAN_CONFIG" != "xno") AM_CONDITIONAL(HAVE_XAPIAN,test "x$XAPIAN_CONFIG" != "xno")
AS_IF([test "x$XAPIAN_CONFIG" = "xno"],[ AS_IF([test "x$XAPIAN_CONFIG" = "xno"],[
@ -181,16 +181,14 @@ AS_IF([test "x$XAPIAN_CONFIG" = "xno"],[
*** If you compiled it yourself, you should ensure that xapian-config *** If you compiled it yourself, you should ensure that xapian-config
*** is in your PATH.])], *** is in your PATH.])],
[xapian_version=$($XAPIAN_CONFIG --version | sed -e 's/.* //')]) [xapian_version=$($XAPIAN_CONFIG --version | sed -e 's/.* //')])
AS_CASE([$xapian_version],
[1.[[3-9]].[[3-9]]*],
[AC_DEFINE([XAPIAN_HAVE_OP_WILDCARD],[1],[Xapian::Query::OP_WILDCARD?])],
[1.[[2-9]].[[0-9]]*],
[AC_MSG_WARN([*** xapian $xapian_version, no Query::Op::Wildcard])],
[AC_MSG_ERROR([*** xapian version >= 1.2 needed,
but version $xapian_version found.])])
XAPIAN_CXXFLAGS="`$XAPIAN_CONFIG --cxxflags`" AS_CASE([$xapian_version],
XAPIAN_LIBS="`$XAPIAN_CONFIG --libs`" [1.[[4-9]].[[0-9]]*],
[AC_DEFINE([XAPIAN_HAVE_OP_WILDCARD],[1],[Xapian::Query::OP_WILDCARD?])],
[AC_MSG_ERROR([*** xapian version >= 1.4 needed, but version $xapian_version found.])])
XAPIAN_CXXFLAGS="$($XAPIAN_CONFIG --cxxflags)"
XAPIAN_LIBS="($XAPIAN_CONFIG --libs)"
have_xapian="yes" have_xapian="yes"
AC_SUBST(XAPIAN_CXXFLAGS) AC_SUBST(XAPIAN_CXXFLAGS)