Mercurial > pidgin
changeset 27701:ab0dace4c688
merge of '676252faa4180c3a4995644d57dd0394f55d5db7'
and '9b3deec2188b0d6cd5015cc06c8de2f7d5696a59'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Mon, 27 Jul 2009 03:33:32 +0000 |
| parents | 02dd3b637d66 (current diff) 7a456d5da878 (diff) |
| children | ce3bc26aa8cd |
| files | |
| diffstat | 2 files changed, 9 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun Jul 26 19:51:40 2009 +0000 +++ b/ChangeLog Mon Jul 27 03:33:32 2009 +0000 @@ -3,7 +3,7 @@ version 2.6.0 (??/??/2009): libpurple: * Theme support in libpurple thanks to Justin Rodriguez's summer of code - project. With some minor additions and clean ups from Paul Aurich. + project, with some minor additions and cleanups from Paul Aurich. * Voice & Video framework in libpurple, thanks to Mike Ruprecht's summer of code project in 2008. * It should no longer be possible to end up with duplicates of buddies @@ -119,10 +119,11 @@ (Sulabh Mahajan) * Addition of MSN buddies to Yahoo accounts by adding them as 'msn/buddy@somedomain.com' is now supported. (Sulabh Mahajan) - * Further fixes for buddy pictures, aliases etc. + * Further fixes for buddy pictures, aliases, etc. * Yahoo! and Yahoo! JAPAN are now two separate protocol plugins that share common protocol code. You can now have the same account on both - networks. + networks. Accounts should be seamlessly migrated to the new + arrangement. * Ability to set personal details for an account and for buddies in the buddylist.
--- a/configure.ac Sun Jul 26 19:51:40 2009 +0000 +++ b/configure.ac Mon Jul 27 03:33:32 2009 +0000 @@ -1640,14 +1640,14 @@ dnl # Thanks go to Evolution for the checks. dnl ####################################################################### -AC_ARG_WITH(with-system-ssl-certs, [AC_HELP_STRING([--with-system-ssl-certs=<dir>], [directory containing system-wide SSL CA certificates])]) +AC_ARG_WITH(system-ssl-certs, [AC_HELP_STRING([--with-system-ssl-certs=<dir>], [directory containing system-wide SSL CA certificates])], [ssl_certificates_dir=$withval]) SSL_CERTIFICATES_DIR="" -if ! test -z "$with_system_ssl_certs" ; then - if ! test -d "$with_system_ssl_certs" ; then - AC_MSG_ERROR([$with_system_ssl_certs does not exist, if this is the correct location please make sure that it exists.]) +if ! test -z "$ssl_certificates_dir" ; then + if ! test -d "$ssl_certificates_dir" ; then + AC_MSG_ERROR([$ssl_certificates_dir does not exist, if this is the correct location please make sure that it exists.]) fi - SSL_CERTIFICATES_DIR="$with_system_ssl_certs" + SSL_CERTIFICATES_DIR="$ssl_certificates_dir" fi AC_SUBST(SSL_CERTIFICATES_DIR) AM_CONDITIONAL(INSTALL_SSL_CERTIFICATES, test "x$SSL_CERTIFICATES_DIR" = "x")