integrate new query parser

This commit is contained in:
djcb
2017-10-24 22:57:57 +03:00
parent b75f9f508b
commit 5e9cafea59
17 changed files with 373 additions and 979 deletions

View File

@ -52,7 +52,10 @@ AC_PROG_CC_C99
AC_PROG_INSTALL
AC_HEADER_STDC
AX_CXX_COMPILE_STDCXX_14
AX_COMPILER_FLAGS(,,[yes])
AX_VALGRIND_CHECK
# for now, use AM_PROG_LIBTOOL, as we don't want to require
# a too new setup for autotools/libtool
@ -83,7 +86,7 @@ AS_IF([test "x$enable_mu4e" != "xno"], [
lispdir="${lispdir}/mu4e/"
])
AS_CASE([$emacs_version],[*23*|*24*|*25*|*26*],[build_mu4e=yes],
[AC_WARN([emacs is too old to build mu4e (need emacs >= 23.x)])])
[AC_WARN([emacs is too old to build mu4e (need emacs >= 23.x)])])
])
AM_CONDITIONAL(BUILD_MU4E, test "x$build_mu4e" = "xyes")
@ -96,7 +99,7 @@ AC_CHECK_PROGS([PERL], [perl], [no])
AS_IF([test x"$enable_perl" = "xyes" -a x"$PERL" != "xno"], [
AM_PERL_MODULE([Data::SExpression],[build_perl=yes])
if test x"$build_perl" = "xyes"; then
perl_version=`$PERL -Iperl/lib -Mmup -e 'print "$mup::VERSION\n";'`
perl_version=`$PERL -Iperl/lib -Mmup -e 'print "$mup::VERSION\n";'`
fi
])
AM_CONDITIONAL(BUILD_PERL, test "x$build_perl" = "xyes")
@ -183,7 +186,7 @@ AC_SUBST(XAPIAN_LIBS)
# note that MU_STORE_SCHEMA_VERSION does not necessarily follow MU
# versioning, as we hopefully don't have updates for each version;
# also, this has nothing to do with Xapian's software version
AC_DEFINE(MU_STORE_SCHEMA_VERSION,["9.9"], ['Schema' version of the database])
AC_DEFINE(MU_STORE_SCHEMA_VERSION,["0.99"], ['Schema' version of the database])
###############################################################################
@ -230,15 +233,15 @@ AS_IF([test "x$enable_guile" != "xno"], [
AS_IF([test "x$build_guile" = "xyes"],[
AC_PATH_PROG(GUILE_BINARY, [guile], [], [$GUILE_EXECDIR])
AS_IF([test "x$GUILE_BINARY" != "x"],
[AC_DEFINE_UNQUOTED([GUILE_BINARY],["$GUILE_BINARY"],[Path to the guile binary])],
[AC_MSG_WARN([cannot find guile-snarf])])])
[AC_DEFINE_UNQUOTED([GUILE_BINARY],["$GUILE_BINARY"],[Path to the guile binary])],
[AC_MSG_WARN([cannot find guile-snarf])])])
AS_IF([test "x$build_guile" = "xyes"],[
AC_PATH_PROG(GUILE_SNARF, [guile-snarf], [], [$GUILE_EXECDIR])
AS_IF([test "x$GUILE_SNARF" != "x"],
[AC_DEFINE_UNQUOTED([GUILE_SNARF],["$GUILE_SNARF"],[Path to guile-snarf])
GUILE_SITEDIR="`${PKG_CONFIG} guile-2.0 --variable=sitedir`"],
[AC_MSG_WARN([cannot find guile-snarf])])])
[AC_DEFINE_UNQUOTED([GUILE_SNARF],["$GUILE_SNARF"],[Path to guile-snarf])
GUILE_SITEDIR="`${PKG_CONFIG} guile-2.0 --variable=sitedir`"],
[AC_MSG_WARN([cannot find guile-snarf])])])
AC_SUBST(GUILE_SITEDIR)])
AS_IF([test "x$build_guile" = "xyes" -a "x$GUILE_SNARF" != "x"],
@ -281,6 +284,7 @@ mu/Makefile
mu/tests/Makefile
lib/Makefile
lib/doxyfile
lib/parser/Makefile
lib/tests/Makefile
mu4e/Makefile
mu4e/mu4e-meta.el