Mercurial > pidgin.yaz
changeset 23350:adc85bf02fa0
Rename --with-ssl-certificates to --with-system-ssl-certs as per Ethan's
comment on devel@pidgin.im:
I would be inclined to use --with-system-ssl-certdir or something
similar ... the name --with-ssl-certificates sounds like you're
turning on and off the use of certificates altogether.
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Tue, 10 Jun 2008 16:23:14 +0000 |
| parents | 1767bf74b95c |
| children | 9cb1e75854f1 |
| files | ChangeLog configure.ac |
| diffstat | 2 files changed, 9 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Jun 10 16:18:12 2008 +0000 +++ b/ChangeLog Tue Jun 10 16:23:14 2008 +0000 @@ -7,9 +7,10 @@ Marcus Lundblad, Jorge Villaseñor and other contributors) * Yahoo! Japan now uses UTF-8, matching the behavior of official clients and restoring compatibility with the web messenger (Yusuke Odate) - * Add a configure option, --with-ssl-certificates to allow packagers - to specify a system-wide SSL CA certificates directory. Also, when - set, we don't install our SSL CA certs. + * Add a configure option, --with-system-ssl-certs to allow packagers + to specify a system-wide SSL CA certificates directory. When set, + we don't install our SSL CA certs, so it's important that the + libpurple package depend on the CA certificates. Pidgin: * Custom buddy icons can now be added to and removed from buddy list
--- a/configure.ac Tue Jun 10 16:18:12 2008 +0000 +++ b/configure.ac Tue Jun 10 16:23:14 2008 +0000 @@ -1561,14 +1561,14 @@ dnl # Thanks go to Evolution for the checks. dnl ####################################################################### -AC_ARG_WITH(ssl-certificates, [AC_HELP_STRING([--with-ssl-certificates=<dir>], [directory containing system-wide SSL CA certificates])]) +AC_ARG_WITH(with-system-ssl-certs, [AC_HELP_STRING([--with-system-ssl-certs=<dir>], [directory containing system-wide SSL CA certificates])]) SSL_CERTIFICATES_DIR="" -if ! test -z "$with_ssl_certificates" ; then - if ! test -d "$with_ssl_certificates" ; then - AC_MSG_ERROR([$with_ssl_certificates does not exist, if this is the correct location please make sure that it exists.]) +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.]) fi - SSL_CERTIFICATES_DIR="$with_ssl_certificates" + SSL_CERTIFICATES_DIR="$with_system_ssl_certs" fi AC_SUBST(SSL_CERTIFICATES_DIR) AM_CONDITIONAL(INSTALL_SSL_CERTIFICATES, test "x$SSL_CERTIFICATES_DIR" = "x")