diff options
author | Slávek Banko <slavek.banko@axis.cz> | 2019-12-11 01:41:26 +0100 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2019-12-11 02:23:35 +0100 |
commit | 73f00336178a9f312bac2992649120d462e0ac2d (patch) | |
tree | 8672519cb50cb0e642af0817188ad28f810338ee /kopete/protocols/configure.in.in | |
parent | 914254104c50dec222fb31ce7a25a21870e90f16 (diff) | |
download | tdenetwork-73f00336178a9f312bac2992649120d462e0ac2d.tar.gz tdenetwork-73f00336178a9f312bac2992649120d462e0ac2d.zip |
kopete: Restore the MSN protocol because a replacement MSN server was created.
This reverts commits 0486034738 - 2d5f9c55da and f6fd4ab6c0.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'kopete/protocols/configure.in.in')
-rw-r--r-- | kopete/protocols/configure.in.in | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/kopete/protocols/configure.in.in b/kopete/protocols/configure.in.in index 398ebfd0..7a96cc9a 100644 --- a/kopete/protocols/configure.in.in +++ b/kopete/protocols/configure.in.in @@ -104,13 +104,27 @@ AM_CONDITIONAL(include_testbed, test "$with_testbed" = "yes") PKG_CHECK_MODULES(GLIB, glib-2.0 gmodule-2.0, have_glib=yes, have_glib=no) if test x$have_glib = xno; then - AC_MSG_WARN([GLib 2.0 is required for Jabber Jingle. You can get it from http://www.gtk.org/]) + AC_MSG_WARN([GLib 2.0 is required for MSN webcam and Jabber Jingle. You can get it from http://www.gtk.org/]) else AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_LIBS) AC_DEFINE(HAVE_GLIB, 1, [Glib is required for oRTP code and libmimic code]) fi +if test "x$have_glib" != "xyes"; then + compile_msn_webcam=no + msn_webcam_val=0 +else + compile_msn_webcam=yes + msn_webcam_val=1 +fi + +AC_MSG_CHECKING([if MSN webcam support should be enabled]) +AC_MSG_RESULT($compile_msn_webcam) +AC_DEFINE_UNQUOTED(MSN_WEBCAM, $msn_webcam_val, [Define if MSN webcam support can be enabled]) + +AM_CONDITIONAL(include_msn_webcam, test "x$compile_msn_webcam" = "xyes") + # Check for sms protocol AC_ARG_ENABLE(smsgsm, AC_HELP_STRING([--disable-smsgsm], [disable the GSM SMS protocol]), |