telepathy-salut: Update wocky to current master, disabling Google relay support

Simon McVittie smcv at kemper.freedesktop.org
Fri May 3 03:56:21 PDT 2013


Module: telepathy-salut
Branch: master
Commit: 83585d32f183e2a0262f0a62447c5e7f620ef5ca
URL:    http://cgit.freedesktop.org/telepathy/telepathy-salut/commit/?id=83585d32f183e2a0262f0a62447c5e7f620ef5ca

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Fri May  3 11:52:10 2013 +0100

Update wocky to current master, disabling Google relay support

---

 configure.ac  |    3 +++
 lib/ext/wocky |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index 583e2bd..84ce6ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -328,6 +328,9 @@ AS_IF([test "x${prefix}" = "xNONE"], [prefix=/usr/local])
 prev_ac_configure_args=$ac_configure_args
 ac_configure_args="$ac_configure_args --with-installed-headers=${wocky_install_headers_dir} --enable-shared-suffix=${PACKAGE}-${VERSION} --libdir=${pluginexeclibdir}"
 
+# meaningless for Salut's use
+ac_configure_args="$ac_configure_args --disable-google-relay"
+
 AS_IF([test "x$enable_fatal_warnings" = xyes],
   [ac_configure_args="$ac_configure_args --enable-coding-style-checks"],
   [ac_configure_args="$ac_configure_args --disable-coding-style-checks"])
diff --git a/lib/ext/wocky b/lib/ext/wocky
index 762c828..cb1aa11 160000
--- a/lib/ext/wocky
+++ b/lib/ext/wocky
@@ -1 +1 @@
-Subproject commit 762c8281d37f065a174220e802afc599df2bcfdc
+Subproject commit cb1aa11735d309a75377d2ab2134ea7cd166417e



More information about the telepathy-commits mailing list