diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2011-11-23 10:44:26 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2011-11-23 10:51:11 +0200 |
commit | 424589b91c3f367e4c9926804df4bf73bf100e59 (patch) | |
tree | 34e6caf7cefe99f4fc02a082b261931827feb9f9 /configure.ac | |
parent | 00906d3b3bcef1a948ceff6f27b6052e47081552 (diff) | |
download | mailutils-424589b91c3f367e4c9926804df4bf73bf100e59.tar.gz mailutils-424589b91c3f367e4c9926804df4bf73bf100e59.tar.bz2 |
Enable GSASL by default.
* am/gsasl.m4 (MU_CHECK_GSASL): Enable GSASL by default. Other minor fixes.
* am/tls.m4 (MU_CHECK_TLS): Rename to MU_CHECK_GNUTLS. Check option
arguments. Check for gnutls library version.
* configure.ac: Update.
* README: Document the change.
* NEWS: Document the change.
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index ca8921207..f720b7a36 100644 --- a/configure.ac +++ b/configure.ac @@ -251,13 +251,13 @@ AC_SUBST(SERV_AUTHLIBS) AC_SUBST(SERV_AUTHINCS) AC_ARG_WITH([gssapi], - AC_HELP_STRING([--with-gssapi], + AC_HELP_STRING([--with-gssapi@<:@=PATH@:>@], [use GSSAPI authentication]), - [WITH_GSSAPI=$withval], - [WITH_GSSAPI=no]) + [status_gssapi=$withval], + [status_gssapi=no]) -if test "x$WITH_GSSAPI" != "xno"; then - MU_CHECK_GSSAPI($WITH_GSSAPI) +if test "x$status_gssapi" != "xno"; then + MU_CHECK_GSSAPI($status_gssapi) if test "$GSSAPI_IMPL" = "none"; then AC_CACHE_SAVE AC_MSG_RESULT([GSSAPI libraries not found]) @@ -299,19 +299,19 @@ AC_SUBST(SITE_CRAM_MD5_PWD,"\$(sysconfdir)/cram-md5.pwd") AC_ARG_WITH(cram-passwd, AC_HELP_STRING([--with-cram-passwd=FILE], - [use keep passwords for CRAM-MD5 authentication method in FILE (default $SITE_CRAM_MD5_PWD)]), + [keep passwords for CRAM-MD5 authentication method in FILE (default $SITE_CRAM_MD5_PWD)]), [case "${withval}" in /*) SITE_CRAM_MD5_PWD="${withval}";; ./*|../*) AC_MSG_ERROR(Bad value for --with-cram-passwd);; *) SITE_CRAM_MD5_PWD="\$(sysconfdir)/${withval}";; esac]) -MU_CHECK_TLS -if test "$WITH_GNUTLS" != "no"; then +MU_CHECK_GNUTLS([1.2.1],[ MU_AUTHLIBS="$MU_AUTHLIBS $TLS_LIBS" AC_DEFINE(WITH_GNUTLS,1,[Define if mailutils is using GNU TLS]) AC_DEFINE(WITH_TLS,1,[Define if mailutils is using TLS]) -fi + status_gnutls=yes +]) AC_SUBST(SITE_MAIL_RC) AC_ARG_WITH([mail-rc], @@ -1394,9 +1394,9 @@ status_pam=$status_pam status_ltdl=$status_ltdl status_dbm="$status_dbm" status_ldap=$status_ldap -status_gnutls=$WITH_GNUTLS +status_gnutls=$status_gnutls status_gsasl=$status_gsasl -status_gssapi=$WITH_GSSAPI +status_gssapi=$status_gssapi status_guile=$useguile status_python=$status_python status_cxx=$mu_cv_enable_cxx |