diff options
| author | Michael Vetter <jubalh@iodoru.org> | 2020-09-30 19:29:35 +0200 |
|---|---|---|
| committer | Michael Vetter <jubalh@iodoru.org> | 2020-09-30 19:30:40 +0200 |
| commit | 0a9200e268d5291f8caf643373eb4c295116d510 (patch) | |
| tree | 5d3dbddc8efd338db956e4e7dafcb7663e8c153f | |
| parent | 3d082bfb66e322e10b1e5f68aabca435285e634b (diff) | |
| download | profani-tty-0a9200e268d5291f8caf643373eb4c295116d510.tar.gz | |
Require libstrophe/libmesode 0.10.0
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | src/xmpp/connection.c | 8 |
2 files changed, 2 insertions, 18 deletions
diff --git a/configure.ac b/configure.ac index fb9fbbb6..7ccf9964 100644 --- a/configure.ac +++ b/configure.ac @@ -131,19 +131,11 @@ AS_IF([test "x$PTHREAD_CC" != x], [ CC="$PTHREAD_CC" ]) ### Check for libmesode, fall back to libstrophe ### TODO libmesode support will be removed in the future, rewrite this section -PKG_CHECK_MODULES([libmesode], [libmesode >= 0.9.3], +PKG_CHECK_MODULES([libmesode], [libmesode >= 0.10.0], [LIBS="$libmesode_LIBS $LIBS" CFLAGS="$CFLAGS $libmesode_CFLAGS" XMPP_LIB="libmesode" AC_DEFINE([HAVE_LIBMESODE], [1], [libmesode])], - [PKG_CHECK_MODULES([libstrophe], [libstrophe >= 0.9.3], + [PKG_CHECK_MODULES([libstrophe], [libstrophe >= 0.10.0], [LIBS="$libstrophe_LIBS $LIBS" CFLAGS="$CFLAGS $libstrophe_CFLAGS" XMPP_LIB="libstrophe" AC_DEFINE([HAVE_LIBSTROPHE], [1], [libstrophe])], [XMPP_LIB=""])]) -if test "x$XMPP_LIB" = x; then - PKG_CHECK_MODULES([libmesode], [libmesode >= 0.9.2], - [LIBS="$libmesode_LIBS $LIBS" CFLAGS="$CFLAGS $libmesode_CFLAGS" XMPP_LIB="libmesode" AC_DEFINE([HAVE_LIBMESODE], [1], [libmesode])], - [PKG_CHECK_MODULES([libstrophe], [libstrophe >= 0.9.2], - [LIBS="$libstrophe_LIBS $LIBS" CFLAGS="$CFLAGS $libstrophe_CFLAGS" XMPP_LIB="libstrophe" AC_DEFINE([HAVE_LIBSTROPHE], [1], [libstrophe])], - [AC_MSG_ERROR([libstrophe-0.9.2 or later is required for profanity])])]) - AC_DEFINE([HAVE_LIBSTROPHE_LT_0_9_3], [1], [Old libstrophe is present]) -fi AC_MSG_CHECKING([whether ${XMPP_LIB} works]) AC_LINK_IFELSE([AC_LANG_SOURCE([[ diff --git a/src/xmpp/connection.c b/src/xmpp/connection.c index ace28255..0bcab020 100644 --- a/src/xmpp/connection.c +++ b/src/xmpp/connection.c @@ -193,13 +193,7 @@ connection_connect(const char* const jid, const char* const passwd, const char* } if (auth_policy && (g_strcmp0(auth_policy, "legacy") == 0)) { -#ifdef HAVE_LIBSTROPHE_LT_0_9_3 - log_warning("Legacy authentication is requested, but it hasn't been " - "built. Update libstrophe and rebuild Profanity."); - cons_show("Legacy authentication is requested, but it hasn't been built."); -#else flags |= XMPP_CONN_FLAG_LEGACY_AUTH; -#endif /* HAVE_LIBSTROPHE_LT_0_9_3 */ } xmpp_conn_set_flags(conn.xmpp_conn, flags); @@ -215,9 +209,7 @@ connection_connect(const char* const jid, const char* const passwd, const char* LOG_FLAG_IF_SET(XMPP_CONN_FLAG_TRUST_TLS); LOG_FLAG_IF_SET(XMPP_CONN_FLAG_DISABLE_TLS); LOG_FLAG_IF_SET(XMPP_CONN_FLAG_LEGACY_SSL); -#ifndef HAVE_LIBSTROPHE_LT_0_9_3 LOG_FLAG_IF_SET(XMPP_CONN_FLAG_LEGACY_AUTH); -#endif /* HAVE_LIBSTROPHE_LT_0_9_3 */ #undef LOG_FLAG_IF_SET } |