Nicer structure in summary printing of the configure script.

[mmh] / configure.in

diff --git a/configure.in b/configure.in
index 6a4dfff..d15e966 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -78,31 +78,6 @@ fi],
 AC_DEFINE(LOCALE)
 )
 
-dnl Do you want client-side support for using SASL for authentication?
-dnl Note that this code will be enabled for SMTP
-AC_ARG_WITH(cyrus-sasl, AS_HELP_STRING([--with-cyrus-sasl],
-  [Enable SASL support via the Cyrus SASL library]))
-if test x"$with_cyrus_sasl" != x -a x"$with_cyrus_sasl" != x"no"; then
-  AC_DEFINE(CYRUS_SASL, 1,
-    [Define to use the Cyrus SASL library for authentication of SMTP.])dnl
-  if test x"$with_cyrus_sasl" != xyes; then
-    AC_MSG_WARN([Arguments to --with-cyrus-sasl now ignored])
-    AC_MSG_WARN([Please pass the appropriate arguments to CPPFLAGS/LDFLAGS])
-  fi
-  sasl_support=yes
-else
-  sasl_support=no
-fi
-
-dnl Do you want client-side support for encryption with TLS?
-AC_ARG_WITH(tls, AS_HELP_STRING([--with-tls], [Enable TLS support]))
-if test x"$with_tls" != x -a x"$with_tls" != x"no"; then
-  AC_DEFINE(TLS_SUPPORT, 1, [Support TLS for session encryption.])dnl
-  tls_support=yes
-else
-  tls_support=no
-fi
-
 dnl What should be the default editor?
 AC_ARG_WITH(editor,
   AS_HELP_STRING([--with-editor=EDITOR],[specify the default editor]))
@@ -612,26 +587,6 @@ else
 fi
 
 
-dnl --------------------
-dnl CHECK FOR CYRUS-SASL
-dnl --------------------
-
-AS_IF([test x"$sasl_support" = x"yes"],[
-  AC_CHECK_HEADER([sasl/sasl.h], , [AC_MSG_ERROR([sasl.h not found])])
-  AC_CHECK_LIB([sasl2], [sasl_client_new], ,
-    [AC_MSG_ERROR([Cyrus SASL library not found])])])
-
-dnl -----------------
-dnl CHECK FOR OPENSSL
-dnl -----------------
-
-AS_IF([test x"$tls_support" = x"yes"],[
-  AC_CHECK_HEADER([openssl/ssl.h], , [AC_MSG_ERROR([openssl/ssl.h not found])])
-  AC_CHECK_LIB([crypto], [BIO_write], ,
-    [AC_MSG_ERROR([OpenSSL crypto library not found])])
-  AC_CHECK_LIB([ssl], [SSL_library_init], ,
-    [AC_MSG_ERROR([OpenSSL library not found])])])
-
 dnl ---------------------
 dnl CHECK TERMCAP LIBRARY
 dnl ---------------------
@@ -933,22 +888,24 @@ eval "nmhman=${mandir}";         eval "nmhman=${nmhman}"
 echo "
 nmh configuration
 -----------------
-nmh version                : AC_PACKAGE_VERSION
-target os                  : ${target}
-compiler                   : ${CC}
-compiler flags             : ${CFLAGS}
-linker flags               : ${LDFLAGS}
-definitions                : ${OURDEFS}
-source code location       : ${srcdir}
-binary install path        : ${nmhbin}
-library install path       : ${nmhlib}
-config files install path  : ${nmhsysconf}
-man page install path      : ${nmhman}
-backup prefix              : ${backup_prefix}
-file locking type          : ${LOCKTYPE}
-default editor             : ${editorpath}
-default pager              : ${pagerpath}
-email address masquerading : ${masquerade}
-SASL support               : ${sasl_support}
-TLS support                : ${tls_support}"
-echo ""
+nmh version            : AC_PACKAGE_VERSION
+target os              : ${target}
+compiler               : ${CC}
+compiler flags         : ${CFLAGS}
+linker flags           : ${LDFLAGS}
+definitions            : ${OURDEFS}
+source code location   : ${srcdir}
+
+binary install path    : ${nmhbin}
+library install path   : ${nmhlib}
+config install path    : ${nmhsysconf}
+man page install path  : ${nmhman}
+
+default editor         : ${editorpath}
+default pager          : ${pagerpath}
+sendmail               : ${sendmailpath}
+
+backup prefix          : ${backup_prefix}
+file locking type      : ${LOCKTYPE}
+email address masq.    : ${masquerade}
+"