Merge branch 'pr-1111'

Fix a bunch of conflicts, tests.
This commit is contained in:
djcb
2018-08-18 10:29:40 +03:00
9 changed files with 147 additions and 323 deletions

View File

@ -146,11 +146,11 @@ AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS)
glib_version="`$PKG_CONFIG --modversion glib-2.0`"
# gmime, some late-2012 version
PKG_CHECK_MODULES(GMIME,gmime-2.6 >= 2.6.7)
# gmime, version 3.0 or higher
PKG_CHECK_MODULES(GMIME,gmime-3.0)
AC_SUBST(GMIME_CFLAGS)
AC_SUBST(GMIME_LIBS)
gmime_version="`$PKG_CONFIG --modversion gmime-2.6`"
gmime_version="`$PKG_CONFIG --modversion gmime-3.0`"
# xapian checking - we need 1.2.x at least