diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2017-03-21 13:53:47 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-03-21 13:55:26 -0700 |
commit | 3bb5af3a32dd131926fb9cbb5c8db5cd5d97d91c (patch) | |
tree | 881e76899d5fa8eaa292e16c234bb2e9ca2b2a26 | |
parent | 650defd4e74ad00dd16e61c1fc5b4f497821c3d2 (diff) | |
download | emacs-3bb5af3a32dd131926fb9cbb5c8db5cd5d97d91c.tar.gz emacs-3bb5af3a32dd131926fb9cbb5c8db5cd5d97d91c.tar.bz2 emacs-3bb5af3a32dd131926fb9cbb5c8db5cd5d97d91c.zip |
Improve configure --with-pop etc. diagnostics
* configure.ac: Improve diagnostics re --with-pop and
--with-mailutils (Bug#26102).
-rw-r--r-- | configure.ac | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/configure.ac b/configure.ac index fad7fb0104b..9937a6cce91 100644 --- a/configure.ac +++ b/configure.ac @@ -234,14 +234,16 @@ AC_DEFUN([OPTION_DEFAULT_ON], [dnl # connections. Encrypted connections should be the default. OPTION_DEFAULT_OFF([mailutils], - [rely on GNU Mailutils being installed; this makes the options - --without-pop through --with-mailhost irrelevant]) + [rely on GNU Mailutils, so that the --without-pop through --with-mailhost + options are irrelevant]) if test "$with_mailutils" = no; then with_mailutils= fi AC_SUBST([with_mailutils]) -OPTION_DEFAULT_ON([pop],[don't support POP mail retrieval with movemail]) +OPTION_DEFAULT_ON([pop], + [don't support POP mail retrieval with movemail (--without-pop or + --with-mailutils is recommended, as movemail POP is insecure)]) if test "$with_pop" = yes; then AC_DEFINE(MAIL_USE_POP) fi @@ -5482,31 +5484,25 @@ fi AC_OUTPUT if test ! "$with_mailutils"; then + if test "$with_pop" = yes; then + AC_MSG_WARN([This configuration installs a 'movemail' program +that retrieves POP3 email via only insecure channels. +To omit insecure POP3, you can use '$0 --without-pop'.]) + fi + case $opsys in cygwin | mingw32) # Don't suggest GNU Mailutils, as it hasn't been ported. - if test "$with_pop" = yes; then - emacs_fix_movemail="use '$0 --without-pop'" - else - emacs_fix_movemail= - fi;; + ;; *) emacs_fix_movemail="use '$0 --with-mailutils'" case `(movemail --version) 2>/dev/null` in *Mailutils*) ;; *) emacs_fix_movemail="install GNU Mailutils <http://mailutils.org> and $emacs_fix_movemail";; - esac;; + esac + AC_MSG_NOTICE([You might want to $emacs_fix_movemail.]);; esac - - if test "$with_pop" = yes; then - AC_MSG_WARN([This configuration installs a 'movemail' program -that retrieves POP3 email via only insecure channels. -To fix this you can $emacs_fix_movemail.]) - elif test "$emacs_fix_movemail"; then - AC_MSG_NOTICE([This configuration installs a 'movemail' program that cannot -retrieve POP3 email. You might want to $emacs_fix_movemail.]) - fi fi test "$MAKE" = make || AC_MSG_NOTICE([Now you can run '$MAKE'.]) |