diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-05-03 11:52:10 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-05-03 11:52:10 +0100 |
| commit | 83585d32f183e2a0262f0a62447c5e7f620ef5ca (patch) | |
| tree | 056b7443f5689e1ebf542fd3bccb09d819680502 | |
| parent | bb89834474db06d9e0418da9b14a5e0edcf38696 (diff) | |
| download | telepathy-salut-83585d32f183e2a0262f0a62447c5e7f620ef5ca.tar.gz | |
Update wocky to current master, disabling Google relay support
| -rw-r--r-- | configure.ac | 3 | ||||
| m--------- | lib/ext/wocky | 0 |
2 files changed, 3 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 583e2bdf..84ce6ae4 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 -Subproject 762c8281d37f065a174220e802afc599df2bcfd +Subproject cb1aa11735d309a75377d2ab2134ea7cd166417 |