[PATCH] configure.ac: Make SSL tests for OpenSSL and gnutls behave the same
For both this now mentions SMTP as a possible SSL user and also turns
the error for configuring with gnutls without POP/IMAP/SMTP into a
warning as the OpenSSL part does.
---
configure.ac | 35 ++++++++++++++++++-----------------
1 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/configure.ac b/configure.ac
index 90aa4b6..1a09896 100644
--- a/configure.ac
+++ b/configure.ac
@@ -634,11 +634,11 @@ AM_CONDITIONAL(USE_GSS, test x$need_gss = xyes)
dnl -- end imap dependencies --
-AC_ARG_WITH(ssl, AC_HELP_STRING([--with-ssl[=PFX]], [Compile in SSL support
for POP/IMAP]),
+AC_ARG_WITH(ssl, AC_HELP_STRING([--with-ssl[=PFX]], [Compile in SSL support
for POP/IMAP/SMTP using OpenSSL]),
[ if test "$with_ssl" != "no"
then
if test "$need_socket" != "yes"; then
- AC_MSG_WARN([SSL support is only useful with POP or IMAP support])
+ AC_MSG_WARN([SSL support is only useful with POP, IMAP or SMTP
support])
else
if test "$with_ssl" != "yes"
then
@@ -662,27 +662,28 @@ AC_ARG_WITH(ssl, AC_HELP_STRING([--with-ssl[=PFX]],
[Compile in SSL support for
fi
])
-AC_ARG_WITH([gnutls], AC_HELP_STRING([--with-gnutls[=PFX]], [Enable SSL
support using gnutls]),
+AC_ARG_WITH([gnutls], AC_HELP_STRING([--with-gnutls[=PFX]], [Compile in SSL
support for POP/IMAP/SMTP using gnutls]),
[gnutls_prefix="$withval"], [gnutls_prefix="no"])
if test "$gnutls_prefix" != "no" -a x"$need_ssl" != xyes
then
if test "$need_socket" != "yes"
then
- AC_MSG_ERROR([SSL support is only useful with POP or IMAP support])
+ AC_MSG_WARN([SSL support is only useful with POP, IMAP or SMTP support])
+ else
+ MUTT_AM_PATH_GNUTLS([$gnutls_prefix],
+ [dnl GNUTLS found
+ CPPFLAGS="$CPPFLAGS $LIBGNUTLS_CFLAGS"
+ MUTTLIBS="$MUTTLIBS $LIBGNUTLS_LIBS"
+
+ AC_DEFINE(USE_SSL,1,[ Define if you want support for SSL. ])
+ AC_DEFINE(USE_SSL_GNUTLS,1,[ Define if you want support for SSL via
GNUTLS. ])
+
+ MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_ssl_gnutls.o"
+ need_ssl=yes],
+ [dnl GNUTLS not found
+ AC_MSG_ERROR([could not find libgnutls])
+ ])
fi
- MUTT_AM_PATH_GNUTLS([$gnutls_prefix],
- [dnl GNUTLS found
- CPPFLAGS="$CPPFLAGS $LIBGNUTLS_CFLAGS"
- MUTTLIBS="$MUTTLIBS $LIBGNUTLS_LIBS"
-
- AC_DEFINE(USE_SSL,1,[ Define if you want support for SSL. ])
- AC_DEFINE(USE_SSL_GNUTLS,1,[ Define if you want support for SSL via
GNUTLS. ])
-
- MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_ssl_gnutls.o"
- need_ssl=yes],
- [dnl GNUTLS not found
- AC_MSG_ERROR([could not find libgnutls])
- ])
fi
AM_CONDITIONAL(USE_SSL, test x$need_ssl = xyes)
--
1.5.0.4.1009.g31b4