Mercurial > pidgin
changeset 27163:420850f3236e
merge of '02b9e2a56048af7440e6752b0a4d65df7c519ae7'
and '5cffa941d7a297ad42b518e4c97e930a0ad54cd5'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Tue, 23 Jun 2009 19:06:28 +0000 |
| parents | 8f405df1652d (diff) 7054f810b0f9 (current diff) |
| children | 959e86c022f7 |
| files | |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Tue Jun 23 18:20:12 2009 +0000 +++ b/configure.ac Tue Jun 23 19:06:28 2009 +0000 @@ -1663,7 +1663,7 @@ [enable_nss="$enableval"], [enable_nss="yes"]) -msg_ssl="None. MSN, Novell Groupwise, Yahoo! and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable!" +msg_ssl="None. MSN, Yahoo!, Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable!" looked_for_gnutls="no" dnl # dnl # Check for GnuTLS if it's specified. @@ -2057,19 +2057,19 @@ AC_MSG_ERROR([ Neither GnuTLS or NSS SSL development headers found. Use --disable-nss --disable-gnutls if you do not need SSL support. -MSN, Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable! +MSN, Yahoo!, Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable! ]) elif test "x$looked_for_gnutls" = "xyes" -a "x$force_deps" = "xyes" ; then AC_MSG_ERROR([ GnuTLS SSL development headers not found. Use --disable-gnutls if you do not need SSL support. -MSN, Novell Groupwise and Google Talk will not work without SSL support. +MSN, Yahoo!, Novell Groupwise and Google Talk will not work without SSL support. ]) elif test "x$looked_for_nss" = "xyes" -a "x$force_deps" = "xyes" ; then AC_MSG_ERROR([ NSS SSL development headers not found. Use --disable-nss if you do not need SSL support. -MSN, Novell Groupwise and Google Talk will not work without SSL support. +MSN, Yahoo!, Novell Groupwise and Google Talk will not work without SSL support. ]) fi