[evolution-activesync] configure.ac: avoid hard dependency on recent camel
- From: Patrick Ohly <pohly src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-activesync] configure.ac: avoid hard dependency on recent camel
- Date: Tue, 8 Nov 2016 17:12:11 +0000 (UTC)
commit 8104b730f55521907f5797e052784c6a0ed789f4
Author: Patrick Ohly <patrick ohly intel com>
Date: Tue Nov 8 09:10:07 2016 -0800
configure.ac: avoid hard dependency on recent camel
Compiling without the camel backend still works on older distros,
don't abort unnecessarily when the camel-1.2.pc is not recent enough
or missing.
configure.ac | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 737f470..e9c191f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,7 +69,7 @@ PKG_CHECK_MODULES(LIBEMAIL_ENGINE, libemail-engine, [have_libemail_engine="yes"]
EVO_PKG="-3.0"
CAMEL_PKG="camel-1.2"
-PKG_CHECK_MODULES(CAMEL, ${CAMEL_PKG} >= 3.23.2)
+PKG_CHECK_MODULES(CAMEL, ${CAMEL_PKG} >= 3.23.2, [have_camel=yes], [have_camel=no])
AC_SUBST(EVOLUTION_SHELL_CFLAGS)
AC_SUBST(EVOLUTION_SHELL_LIBS)
@@ -142,8 +142,8 @@ AC_ARG_ENABLE(camel-backend,
[Can be used to disable compiling the libcamel email backend. Enabled by
default.]),
[enable_camel="$enableval"], [enable_camel="yes"])
AM_CONDITIONAL([ENABLE_CAMEL_BACKEND], [test "$enable_camel" = "yes"])
-if test "$enable_camel" = "yes" && test "$have_libemail_engine" != "yes"; then
- AC_MSG_ERROR(["libemail-engine.pc is required for the camel backend; use --disable-camel-backend when
EDS is too old or install a more recent EDS"])
+if test "$enable_camel" = "yes" && (test "$have_libemail_engine" != "yes" || test "$have_camel" != "yes");
then
+ AC_MSG_ERROR(["libemail-engine.pc and recent enough camel-1.2.pc are required for the camel backend; use
--disable-camel-backend when EDS is too old or install a more recent EDS"])
fi
AS_AC_EXPAND(LIBEXECDIR, $libexecdir)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]