# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1245783988 0
# Node ID 420850f3236ef26a52b6435ff6ad2dbe3eda5047
# Parent  8f405df1652d4cdf996c22034d8f626cfc42bad3# Parent  7054f810b0f94f03cd1f30eb9109aefa7adb3b0f
merge of '02b9e2a56048af7440e6752b0a4d65df7c519ae7'
     and '5cffa941d7a297ad42b518e4c97e930a0ad54cd5'

diff -r 7054f810b0f9 -r 420850f3236e configure.ac
--- 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