Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Improve configure --with-pop etc. diagnostics

Browse source 
* configure.ac: Improve diagnostics re --with-pop and
--with-mailutils (Bug#26102).
This commit is contained in:
Paul Eggert 2017-03-21 13:53:47 -07:00
parent 650defd4e7
commit 3bb5af3a32
1 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
configure.ac
View file

@ -234,14 +234,16 @@ AC_DEFUN([OPTION_DEFAULT_ON], [dnl
# connections. Encrypted connections should be the default. # connections. Encrypted connections should be the default.
OPTION_DEFAULT_OFF([mailutils], OPTION_DEFAULT_OFF([mailutils],
[rely on GNU Mailutils being installed; this makes the options [rely on GNU Mailutils, so that the --without-pop through --with-mailhost
--without-pop through --with-mailhost irrelevant]) options are irrelevant])
if test "$with_mailutils" = no; then if test "$with_mailutils" = no; then
with_mailutils= with_mailutils=
fi fi
AC_SUBST([with_mailutils]) 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 if test "$with_pop" = yes; then
AC_DEFINE(MAIL_USE_POP) AC_DEFINE(MAIL_USE_POP)
fi fi
@ -5482,31 +5484,25 @@ fi
AC_OUTPUT AC_OUTPUT
if test ! "$with_mailutils"; then 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 case $opsys in
cygwin | mingw32) cygwin | mingw32)
# Don't suggest GNU Mailutils, as it hasn't been ported. # 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'" emacs_fix_movemail="use '$0 --with-mailutils'"
case `(movemail --version) 2>/dev/null` in case `(movemail --version) 2>/dev/null` in
*Mailutils*) ;; *Mailutils*) ;;
*) emacs_fix_movemail="install GNU Mailutils *) emacs_fix_movemail="install GNU Mailutils
<http://mailutils.org> and $emacs_fix_movemail";; <http://mailutils.org> and $emacs_fix_movemail";;
esac;; esac
AC_MSG_NOTICE([You might want to $emacs_fix_movemail.]);;
esac 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 fi
test "$MAKE" = make || AC_MSG_NOTICE([Now you can run '$MAKE'.]) test "$MAKE" = make || AC_MSG_NOTICE([Now you can run '$MAKE'.])